diff options
| author | itetcu <itetcu@FreeBSD.org> | 2011-08-04 18:22:12 +0800 |
|---|---|---|
| committer | itetcu <itetcu@FreeBSD.org> | 2011-08-04 18:22:12 +0800 |
| commit | 1f78a4db3000e40bcb806eff2cec1329bb273a7e (patch) | |
| tree | 56931237d012fb315f16c74edbc7882bbc691230 /net | |
| parent | ed9949c1576e843ab778e5f2f861b884b0a69acb (diff) | |
| download | freebsd-ports-gnome-1f78a4db3000e40bcb806eff2cec1329bb273a7e.tar.gz freebsd-ports-gnome-1f78a4db3000e40bcb806eff2cec1329bb273a7e.tar.zst freebsd-ports-gnome-1f78a4db3000e40bcb806eff2cec1329bb273a7e.zip | |
- fix build on non-default LOCALBASE
- use global CFLAGS picking up any += modifications from make.conf / etc.
- strip binaries based on STRIP either explicitly or as part of
WITH_DEBUG|DEBUG_FLAGS
- silence warning about ServerExtraDefines redefinition on amd64
- regen newline in vnclibs.def patch (fixes editing in emacs)
- pet portlint
PR: 157930
Submitted by: Pan Tsu <inyaoo@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tightvnc/Makefile | 5 | ||||
| -rw-r--r-- | net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf | 16 | ||||
| -rw-r--r-- | net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def | 9 |
3 files changed, 22 insertions, 8 deletions
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 448a82ebf716..150929786915 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -15,13 +15,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}_unixsrc MAINTAINER= itetcu@FreeBSD.org COMMENT= Enhanced version of VNC -MAKE_JOBS_UNSAFE= yes LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= showrgb:${PORTSDIR}/x11/rgb \ xauth:${PORTSDIR}/x11/xauth \ xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts +MAKE_JOBS_UNSAFE= yes + CONFLICTS= tridiavnc-[0-9]* vnc-[0-9]* WRKSRC= ${WRKDIR}/vnc_unixsrc @@ -71,9 +72,11 @@ post-patch: do-install: @(cd ${WRKSRC}; ./vncinstall ${PREFIX}/bin ${PREFIX}/man) +.if defined(STRIP) && ${STRIP} != "" .for FILE in Xvnc vncviewer vncpasswd vncconnect @${STRIP_CMD} ${PREFIX}/bin/${FILE} .endfor +.endif .ifdef(WITH_JVNC_VIEWER) @${MKDIR} ${DATADIR}/classes ${INSTALL_DATA} ${WRKSRC}/classes/*.* ${DATADIR}/classes diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf index 59aae4a84bd2..99b35a2822f4 100644 --- a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf +++ b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf @@ -1,18 +1,28 @@ --- Xvnc/config/cf/FreeBSD.cf.orig 2000-06-11 21:00:51.000000000 +0900 +++ Xvnc/config/cf/FreeBSD.cf 2009-03-09 08:18:00.000000000 +0900 +@@ -223,7 +223,9 @@ XCOMM operating system: OSName (OSMajor + # define GccGasOption /**/ + #endif + ++#ifndef x86_64Architecture + #define ServerExtraDefines GccGasOption XFree86ServerDefines ++#endif + + #define StandardDefines -DCSRG_BASED + @@ -253,11 +253,17 @@ #endif #ifdef i386Architecture -# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags -O2 -pipe ++# define OptimizedCDebugFlags %%CFLAGS%% #else -# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags -O2 -pipe ++# define OptimizedCDebugFlags %%CFLAGS%% #endif +#ifdef x86_64Architecture -+# define OptimizedCDebugFlags -O2 -pipe ++# define OptimizedCDebugFlags %%CFLAGS%% +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 +#endif /* x86_64Architecture */ diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def index 40f25604a389..79c1e70adfbf 100644 --- a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def +++ b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def @@ -3,16 +3,17 @@ @@ -5,13 +5,6 @@ * and programs/Xserver/hw/vnc whenever you change this file. */ - + -VNCLIBS = $(TOP)/../libvncauth/libvncauth.a - -#ifdef OSF1Architecture -/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ -VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt -#else -+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/local/lib/libjpeg.a -+VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include -L/usr/local/lib - VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt +-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt -#endif - -VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include ++VNCLIBS = $(TOP)/../libvncauth/libvncauth.a %%LOCALBASE%%/lib/libjpeg.a ++VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib ++VNCSYSLIBS = -L%%LOCALBASE%%/lib -ljpeg -lz -lcrypt |