diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2008-04-10 10:22:19 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2008-04-10 10:22:19 +0000 |
| commit | b86a05ab734949eb985d2a62267f2039c042d19d (patch) | |
| tree | da7f8649fa5f4a4aeb3981d6d77c8f0472c93bc3 /net/nxserver/files/patch-nxviewer-nxviewer-Imakefile | |
| parent | Reduce list of runtime dependencies. (diff) | |
- update to 2.1.0
- make portlint happier
- fix missing USE_LDCONFIG
PR: 112887
Obtained from: http://www.deweyonline.com/nx/freebsd.html
Notes
Notes:
svn path=/head/; revision=211000
Diffstat (limited to 'net/nxserver/files/patch-nxviewer-nxviewer-Imakefile')
| -rw-r--r-- | net/nxserver/files/patch-nxviewer-nxviewer-Imakefile | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile index 177a4eace7e5..0d13d258dc49 100644 --- a/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile +++ b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile @@ -1,21 +1,23 @@ ---- nxviewer/nxviewer/Imakefile.orig Thu Jun 17 11:44:40 2004 -+++ nxviewer/nxviewer/Imakefile Mon Feb 7 02:22:45 2005 -@@ -37,7 +37,7 @@ +--- nxviewer/nxviewer/Imakefile.orig Fri Dec 1 08:54:17 2006 ++++ nxviewer/nxviewer/Imakefile +@@ -26,6 +26,11 @@ + DEFINES = -DMITSHM #endif ++#if defined(i386Architecture) && defined(FreeBSDArchitecture) ++DEFINES = -DMITSHM ++JPEG_INC = -I/usr/local/include ++#endif ++ + NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include + NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext --INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC) -+INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/local/include -I$(X11BASE)/include/X11 $(NX_INC) - VNCAUTH_LIB = ./libvncauth.a - ZLIB_LIB = -L/usr/local/lib -lz - JPEG_LIB = -L/usr/local/lib -ljpeg -@@ -50,6 +50,9 @@ +@@ -37,7 +42,7 @@ #endif - DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) -+XPLIBSRC = -+XPLIB = -+ - LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB) +-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC) ++INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I../../nx-X11/exports/include/X11 $(NX_INC) + VNCAUTH_LIB = ../libvncauth/libvncauth.a + ZLIB_LIB = -L/usr/local/lib -lz |