Date: 9 Apr 2004 12:23:51 -0000 From: James Raftery <james@now.ie> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65354: [maintainer patch] update port net/vnc Message-ID: <20040409122351.68011.qmail@bender.kerna.ie> Resent-Message-ID: <200404091230.i39CUFYJ036040@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65354
>Category: ports
>Synopsis: [maintainer patch] update port net/vnc
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 09 05:30:15 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: James Raftery
>Release: FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD bender.kerna.ie 4.9-RELEASE-p3 FreeBSD 4.9-RELEASE-p3 #0: Wed Mar 10 22:03:56 GMT 2004 root@bender.kerna.ie:/usr/obj/usr/src/sys/GENERIC i386
>Description:
net/vnc port does not compile on non-i386 systems. These patches
resolve the problems.
>How-To-Repeat:
>Fix:
Patch to Makefile below, and five patch files to be added to the
net/vnc/files directory.
Thanks.
--- Makefile.patch begins here ---
--- net/vnc/Makefile.orig Thu Mar 25 17:04:50 2004
+++ net/vnc/Makefile Thu Mar 25 17:13:48 2004
@@ -38,12 +38,6 @@
USE_PERL5_RUN= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN= "Does not compile on !i386"
-.endif
-
pre-build:
.if !defined(WITHOUT_SERVER)
@${ECHO_MSG} "NOTE:"
@@ -102,4 +96,4 @@
${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1
${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man ${PREFIX}/man/man1/vncconnect.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- Makefile.patch ends here ---
--- patch-Xvnc::config::cf::FreeBSD.cf begins here ---
--- Xvnc/config/cf/FreeBSD.cf.orig Mon Mar 22 16:41:12 2004
+++ Xvnc/config/cf/FreeBSD.cf Wed Mar 24 15:50:22 2004
@@ -26,6 +26,7 @@
#define UseGas YES
#define GnuCpp YES
#define HasNdbm YES
+#define DBMLibrary /* ndbm is in libc */
#define HasPutenv YES
#define HasSnprintf YES
#define HasBSD44Sockets YES
@@ -50,7 +51,7 @@
#define MkdirHierCmd mkdir -p
#define CcCmd cc
-#define CppCmd /usr/libexec/cpp
+#define CppCmd /usr/bin/cpp
#define PreProcessCmd CppCmd
#define StandardCppDefines -traditional
#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
@@ -223,12 +224,29 @@
# define GccGasOption /**/
#endif
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
+#ifdef i386Architecture
+# define ServerExtraDefines GccGasOption XFree86ServerDefines
+#else
+# define ServerExtraDefines GccGasOption -D_XSERVER64
+#endif
#define StandardDefines -DCSRG_BASED
+#ifdef i386Architecture
+# if OSMajorVersion > 1
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# else
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+# endif
+#else
+# if defined(SparcArchitecture) || defined(AlphaArchitecture)
+# define ServerOSDefines -DDDXOSINIT
+# else
+# define ServerOSDefines /**/
+# endif
+#endif
+
#if OSMajorVersion > 1
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
#define XawI18nDefines -DUSE_XWCHAR_STRING
#define HasMakefileSafeInclude YES
#define IncludeMakefile(file) @@# dependencies are in .depend
@@ -241,7 +259,6 @@
#endif
#define HasMkstemp YES
#else
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif
@@ -252,10 +269,15 @@
#endif
#endif
+/* Suppress "The -O2 flag TRIGGERS KNOWN OPTIMIZER BUGS ON THIS PLATFORM" on Alpha 4.x */
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
-# define OptimizedCDebugFlags -O2
+# if defined(AlphaArchitecture) && OSMajorVersion < 5
+# define OptimizedCDebugFlags -O
+# else
+# define OptimizedCDebugFlags -O2
+# endif
#endif
#ifndef PreIncDir
--- patch-Xvnc::config::cf::FreeBSD.cf ends here ---
--- patch-Xvnc::config::cf::Imake.cf begins here ---
--- Xvnc/config/cf/Imake.cf.orig Mon Mar 22 16:41:05 2004
+++ Xvnc/config/cf/Imake.cf Mon Mar 22 16:27:03 2004
@@ -154,6 +154,14 @@
# define i386Architecture
# undef i386
# endif
+# if defined(__sparc__) || defined(sparc)
+# define SparcArchitecture
+# undef sparc
+# endif
+# ifdef __alpha__
+# define AlphaArchitecture
+# undef __alpha__
+# endif
#endif /* __FreeBSD__ */
#ifdef AMOEBA
--- patch-Xvnc::config::cf::Imake.cf ends here ---
--- patch-Xvnc::config::cf::vnc.def begins here ---
--- Xvnc/config/cf/vnc.def.orig Wed Mar 24 11:45:48 2004
+++ Xvnc/config/cf/vnc.def Wed Mar 24 11:53:03 2004
@@ -122,6 +122,9 @@
#endif
#endif
+#ifdef FreeBSDArchitecture
+#define ProjectRoot /usr/X11R6
+#endif
/*****************************************************************************/
/*
--- patch-Xvnc::config::cf::vnc.def ends here ---
--- patch-Xvnc::programs::Xserver::cfb::stipsparc.s begins here ---
--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig Wed Mar 24 16:34:12 2004
+++ Xvnc/programs/Xserver/cfb/stipsparc.s Wed Mar 24 16:34:49 2004
@@ -85,7 +85,7 @@
#define ForEachBits LY4
#define NextBits LY5
-#ifdef SVR4
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfbStippleStack cfbStippleStackTE
#else
--- patch-Xvnc::programs::Xserver::cfb::stipsparc.s ends here ---
--- patch-Xvnc::programs::Xserver::cfb::stipsprc32.s begins here ---
--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig Thu Mar 25 10:28:07 2004
+++ Xvnc/programs/Xserver/cfb/stipsprc32.s Thu Mar 25 10:29:02 2004
@@ -81,7 +81,7 @@
#define ForEachBits LY4
#define NextBits LY5
-#ifdef SVR4
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfb32StippleStack cfb32StippleStackTE
#else
--- patch-Xvnc::programs::Xserver::cfb::stipsprc32.s ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040409122351.68011.qmail>