svn commit: r358201 - in head/net/tridiavnc: . files
Cy Schubert
cy at FreeBSD.org
Wed Jun 18 03:15:37 UTC 2014
Author: cy
Date: Wed Jun 18 03:15:35 2014
New Revision: 358201
URL: http://svnweb.freebsd.org/changeset/ports/358201
QAT: https://qat.redports.org/buildarchive/r358201/
Log:
Support stage.
Fix build under clang.
Relinquish maintainership.
Added:
head/net/tridiavnc/files/patch-Xvnc-lib-Xau-AuUnlock.c (contents, props changed)
head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-regions.c (contents, props changed)
head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-t1malloc.c (contents, props changed)
head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-type1.c (contents, props changed)
head/net/tridiavnc/files/patch-Xvnc-lib-font-bitmap-fontink.c (contents, props changed)
head/net/tridiavnc/files/patch-Xvnc-programs-Xserver-hw-vnc-corre.c (contents, props changed)
head/net/tridiavnc/files/patch-unix-vnc_unixsrc-vncpasswd-vncpasswd.c (contents, props changed)
Modified:
head/net/tridiavnc/Makefile
head/net/tridiavnc/pkg-plist
Modified: head/net/tridiavnc/Makefile
==============================================================================
--- head/net/tridiavnc/Makefile Wed Jun 18 02:44:56 2014 (r358200)
+++ head/net/tridiavnc/Makefile Wed Jun 18 03:15:35 2014 (r358201)
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=dwcjr
DISTNAME= DevVNC_unix
EXTRACT_SUFX= .tgz
-MAINTAINER= cy at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= Display X and Win32 desktops on remote X/Win32/Java displays
LICENSE= GPLv2
@@ -26,22 +26,23 @@ MAKE_JOBS_UNSAFE=yes
CONFLICTS= tightvnc-[0-9]* vnc-[0-9]*
-.ifdef(TRIDIAVNC_BASE)
-PREFIX=${TRIDIAVNC_BASE}
-MAKE_ENV+= DESTDIR=${TRIDIAVNC_BASE}
-.endif
+# .ifdef(TRIDIAVNC_BASE)
+# PREFIX=${TRIDIAVNC_BASE}
+# MAKE_ENV+= DESTDIR=${TRIDIAVNC_BASE}
+# .endif
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} != i386
BROKEN= Does not compile on ${MACHINE_ARCH}
-NO_XVNC= yes
PLIST_SUB+= XVNC="@comment "
.else
PLIST_SUB+= XVNC=""
.endif
+# XXX Broken under clang
+NO_XVNC= yes
+
post-patch:
.for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def Xvnc/config/cf/Imake.tmpl
${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${file}
@@ -53,14 +54,19 @@ post-patch:
# to do the install ourselves.
post-install:
.if !defined(NO_XVNC)
- ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
+ ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \
+ ${STAGEDIR}${PREFIX}/bin/Xvnc
.endif
- ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
- ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
- ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
- ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
+ ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer \
+ ${STAGEDIR}${PREFIX}/bin/vncviewer
+ ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \
+ ${STAGEDIR}${PREFIX}/bin/vncpasswd
+ ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \
+ ${STAGEDIR}${PREFIX}/bin/vncconnect
+ ${INSTALL_SCRIPT} ${WRKSRC}/vncserver \
+ ${STAGEDIR}${PREFIX}/bin/vncserver
# Go install Java classes
- ${MKDIR} ${PREFIX}/share/vnc
- ${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/vnc
+ ${CP} -R ${WRKSRC}/classes ${STAGEDIR}${PREFIX}/share/vnc
.include <bsd.port.post.mk>
Added: head/net/tridiavnc/files/patch-Xvnc-lib-Xau-AuUnlock.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-Xvnc-lib-Xau-AuUnlock.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,11 @@
+--- Xvnc/lib/Xau/AuUnlock.c.orig 2000-04-12 11:18:27.000000000 -0700
++++ Xvnc/lib/Xau/AuUnlock.c 2013-10-30 23:24:19.000000000 -0700
+@@ -44,7 +44,7 @@
+ char link_name[1025];
+
+ if (strlen (file_name) > 1022)
+- return;
++ return(0);
+ #ifndef WIN32
+ (void) strcpy (creat_name, file_name);
+ (void) strcat (creat_name, "-c");
Added: head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-regions.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-regions.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,11 @@
+--- Xvnc/lib/font/Type1/regions.c.orig 2000-04-12 11:18:28.000000000 -0700
++++ Xvnc/lib/font/Type1/regions.c 2013-10-30 23:15:05.000000000 -0700
+@@ -1355,7 +1355,7 @@
+
+ beg = left->link;
+ if (beg == right)
+- return;
++ return(0);
+
+ for (p = beg; p != right; p = p->link) {
+ if (p->link == NULL && right != NULL)
Added: head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-t1malloc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-t1malloc.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,20 @@
+--- Xvnc/lib/font/Type1/t1malloc.c.orig 2000-04-12 11:18:28.000000000 -0700
++++ Xvnc/lib/font/Type1/t1malloc.c 2013-10-30 23:14:26.000000000 -0700
+@@ -286,7 +286,7 @@
+ */
+ addr[0] = addr[size - 1] = size;
+ firstcombined = (struct freeblock *) addr;
+- return;
++ return(0);
+ }
+ /*
+ Otherwise, we unhook this pointer from the chain:
+@@ -657,7 +657,7 @@
+ register struct freeblock *p; /* pointer to block */
+
+ if (area == NULL)
+- return;
++ return (0);
+ wholesize = - *area++;
+ wholesize -= 2;
+
Added: head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-type1.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-Xvnc-lib-font-Type1-type1.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,29 @@
+--- Xvnc/lib/font/Type1/type1.c.orig 2000-04-12 11:18:29.000000000 -0700
++++ Xvnc/lib/font/Type1/type1.c 2013-10-30 23:48:25.000000000 -0700
+@@ -886,7 +886,7 @@
+ if (!DoRead(&Code4)) goto ended;
+ Push((double)((((((Code1<<8) + Code2)<<8) + Code3)<<8) + Code4));
+ }
+- return;
++ return(0);
+
+ ended: Error0("Decode: Premature end of Type 1 CharString");
+ }
+@@ -1321,7 +1321,7 @@
+ for (;;) {
+ if (!DoRead(&Code)) break;
+ Decode(Code);
+- if (errflag) return;
++ if (errflag) return(0);
+ }
+ /* Copy snapped path to mypath and set path to NULL as above. */
+ mypath = Snap(path);
+@@ -1344,7 +1344,7 @@
+ for (;;) {
+ if (!DoRead(&Code)) break;
+ Decode(Code);
+- if (errflag) return;
++ if (errflag) return(0);
+ }
+ path = Join(mypath, path);
+ }
Added: head/net/tridiavnc/files/patch-Xvnc-lib-font-bitmap-fontink.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-Xvnc-lib-font-bitmap-fontink.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,18 @@
+--- Xvnc/lib/font/bitmap/fontink.c.orig 2000-04-12 11:18:29.000000000 -0700
++++ Xvnc/lib/font/bitmap/fontink.c 2013-10-30 23:18:04.000000000 -0700
+@@ -94,7 +94,7 @@
+ pInk->rightSideBearing = leftBearing;
+ pInk->ascent = 0;
+ pInk->descent = 0;
+- return;
++ return(0);
+ found_ascent:
+ pInk->ascent = vpos - descent + 1;
+
+@@ -215,5 +215,5 @@
+ out_line += out_bytes;
+ }
+ }
+- return;
++ return(0);
+ }
Added: head/net/tridiavnc/files/patch-Xvnc-programs-Xserver-hw-vnc-corre.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-Xvnc-programs-Xserver-hw-vnc-corre.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,19 @@
+--- Xvnc/programs/Xserver/hw/vnc/corre.c.orig 2000-04-12 11:18:32.000000000 -0700
++++ Xvnc/programs/Xserver/hw/vnc/corre.c 2013-10-30 23:32:20.000000000 -0700
+@@ -63,14 +63,14 @@
+ rfbSendRectEncodingCoRRE(cl, x, y, w, cl->correMaxHeight );
+ rfbSendRectEncodingCoRRE(cl, x, y + cl->correMaxHeight, w,
+ h - cl->correMaxHeight);
+- return;
++ return(0);
+ }
+
+ if (w > cl->correMaxWidth) {
+ rfbSendRectEncodingCoRRE(cl, x, y, cl->correMaxWidth, h);
+ rfbSendRectEncodingCoRRE(cl, x + cl->correMaxWidth, y,
+ w - cl->correMaxWidth, h);
+- return;
++ return(0);
+ }
+
+ rfbSendSmallRectEncodingCoRRE(cl, x, y, w, h);
Added: head/net/tridiavnc/files/patch-unix-vnc_unixsrc-vncpasswd-vncpasswd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tridiavnc/files/patch-unix-vnc_unixsrc-vncpasswd-vncpasswd.c Wed Jun 18 03:15:35 2014 (r358201)
@@ -0,0 +1,11 @@
+--- vncpasswd/vncpasswd.c.orig 2000-04-12 11:18:36.000000000 -0700
++++ vncpasswd/vncpasswd.c 2013-10-30 22:56:22.000000000 -0700
+@@ -84,7 +84,7 @@
+ }
+ for (i = 0; i < strlen(passwd); i++)
+ passwd[i] = passwd1[i] = '\0';
+- return;
++ return (0);
+ }
+
+ fprintf(stderr,"They don't match. Try again.\n\n");
Modified: head/net/tridiavnc/pkg-plist
==============================================================================
--- head/net/tridiavnc/pkg-plist Wed Jun 18 02:44:56 2014 (r358200)
+++ head/net/tridiavnc/pkg-plist Wed Jun 18 03:15:35 2014 (r358201)
@@ -1,4 +1,3 @@
-%%XVNC%%bin/Xvnc
bin/vncviewer
bin/vncpasswd
bin/vncserver
More information about the svn-ports-all
mailing list