Browse Source

Stefan Paletta:


			
			
				rocklinux
			
			
		
Stefan Paletta 21 years ago
parent
commit
9e05b674b0
3 changed files with 11 additions and 86 deletions
  1. +0
    -49
      package/rene/vnc/no-man.diff
  2. +6
    -33
      package/rene/vnc/vnc.conf
  3. +5
    -4
      package/rene/vnc/vnc.desc

+ 0
- 49
package/rene/vnc/no-man.diff

@ -1,49 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/vnc/no-man.diff
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./vncviewer/Makefile Mon Jan 20 16:53:18 2003
+++ ./vncviewer/Makefile Mon Jan 20 17:04:35 2003
@@ -970,8 +970,6 @@
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) vncviewer $(DESTDIR)$(BINDIR)/vncviewer
-all:: vncviewer.$(MANSUFFIX).html
-
vncviewer.$(MANSUFFIX).html: vncviewer.$(MANNEWSUFFIX)
$(RM) vncviewer.$(MANSUFFIX).html vncviewer.$(MANSUFFIX)-html
$(RMAN) $(RMANOPTIONS) < vncviewer.$(MANNEWSUFFIX) \
@@ -993,13 +991,12 @@
cleandir::
$(RM) vncviewer.$(MANSUFFIX).html vncviewer.$(MANSUFFIX)-html
-all:: vncviewer.$(MANNEWSUFFIX)
-
vncviewer.$(MANNEWSUFFIX): vncviewer.$(MANSRCSUFFIX)
$(RM) $@
cd `dirname vncviewer` && \
$(LN) `basename vncviewer.$(MANSRCSUFFIX)` `basename $@`
-
+ touch vncviewer.$(MANSRCSUFFIX)
+
cleandir::
$(RM) vncviewer.$(MANNEWSUFFIX)

+ 6
- 33
package/rene/vnc/vnc.conf

@ -6,7 +6,7 @@
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/vnc/vnc.conf
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -20,36 +20,9 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
main() {
mkdir -p /$prefix/classes
patch -Nfp0 << EOT
--- vncserver
+++ vncserver
@@ -36,5 +36,5 @@
\$depth = 8;
\$desktopName = "X";
-\$vncClasses = "/usr/local/vnc/classes";
+\$vncClasses = "/$prefix/classes";
\$vncUserDir = "\$ENV{HOME}/.vnc";
\$xauthorityFile = "\$ENV{HOME}/.Xauthority";
--- Xvnc/config/cf/xfree86.cf
+++ Xvnc/config/cf/xfree86.cf
@@ -998,5 +998,5 @@
#define DefaultCCOptions /* -ansi */
#else
-#define DefaultCCOptions -ansi -pedantic
+#define DefaultCCOptions
#endif
#endif
EOT
xmkmf
eval $MAKE Makefiles
patch -p1 < $confdir/no-man.diff
eval $MAKE depend all ; cd Xvnc ; eval $MAKE World ; cd ..
./vncinstall /$prefix/bin ; cp classes/* /$prefix/classes
}
custmain=main
pkginstalled zlib && var_append confopt ' ' '--with-installed-zlib'
hook_add inmake 1 'cd Xvnc ; eval $MAKE World ; cd ..'
makeinstopt=""
hook_add postmake 10 './vncinstall $bindir $mandir'
hook_add postmake 11 'mkdir -p $datadir/$pkg/classes ; cp -v classes/* $datadir/$pkg/classes'

+ 5
- 4
package/rene/vnc/vnc.desc

@ -7,7 +7,7 @@
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/rene/vnc/vnc.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
@ -28,17 +28,18 @@
[T] not only on the machine where it is running, but from anywhere on the
[T] Internet and from a wide variety of machine architectures.
[U] http://www.uk.research.att.com/vnc/
[U] http://www.realvnc.com/
[A] AT&T Laboratories Cambridge
[A] RealVNC Ltd
[M] Rene Rebe <rene@rocklinux.org>
[C] extra/network
[L] GPL
[S] Stable
[V] 3.3.3r2
[V] 3.3.7
[P] X -----5---9 657.000
[D] 3974202238 vnc-3.3.3r2_unixsrc.tgz http://www.uk.research.att.com/vnc/dist/
[D] 3463924233 vnc-3.3.7-unixsrc.tar.gz http://www.realvnc.com/dist/

Loading…
Cancel
Save