ports/161411: [patch] unbreak net/tridiavnc for non-i386

4720 at hushmail.com 4720 at hushmail.com
Sun Oct 9 04:40:02 UTC 2011


>Number:         161411
>Category:       ports
>Synopsis:       [patch] unbreak net/tridiavnc for non-i386
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 09 04:40:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     4720 at hushmail.com
>Release:        
>Organization:
>Environment:
>Description:
patch unbreaks net/tridiavnc on amd64. i have no access to other archs to test on to see if it's only unbroken for i386+amd64.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/tridiavnc/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	23 Sep 2011 22:24:37 -0000	1.18
+++ Makefile	9 Oct 2011 02:54:44 -0000
@@ -17,6 +17,8 @@
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 
+LICENSE=	GPLv2
+
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/unix/vnc_unixsrc
 USE_IMAKE=	yes
@@ -24,6 +26,7 @@
 ALL_TARGET=	World
 NO_INSTALL_MANPAGES=	yes
 XFREE86_HTML_MAN=	no
+MAKE_JOBS_UNSAFE=yes
 
 CONFLICTS=	tightvnc-[0-9]* vnc-[0-9]*
 
@@ -35,7 +38,10 @@
 .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
 
 post-patch:
@@ -48,7 +54,9 @@
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
 post-install:
+.if !defined(NO_XVNC)
 	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/tridiavnc/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	20 May 2011 19:49:17 -0000	1.4
+++ pkg-plist	9 Oct 2011 02:54:44 -0000
@@ -1,4 +1,4 @@
-bin/Xvnc
+%%XVNC%%bin/Xvnc
 bin/vncviewer
 bin/vncpasswd
 bin/vncserver


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list