svn commit: r414578 - in head/x11/xforward: . files
Cy Schubert
cy at FreeBSD.org
Wed May 4 03:12:37 UTC 2016
Author: cy
Date: Wed May 4 03:12:35 2016
New Revision: 414578
URL: https://svnweb.freebsd.org/changeset/ports/414578
Log:
Add static option which also builds xforward-static which can be copied
to a firewall/gateway/proxy machine without a full-blown X insstalled.
Modified:
head/x11/xforward/Makefile
head/x11/xforward/files/patch-Makefile
Modified: head/x11/xforward/Makefile
==============================================================================
--- head/x11/xforward/Makefile Wed May 4 03:06:58 2016 (r414577)
+++ head/x11/xforward/Makefile Wed May 4 03:12:35 2016 (r414578)
@@ -16,8 +16,17 @@ COMMENT= Provide user-level X forwarding
LICENSE_FILE= ${WRKSRC}/NOTICE
MAKE_ARGS+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
-USE_XORG= x11 xt xaw
+USE_XORG= x11 xt xaw xmu xt xext sm ice xp xft xau xcb xdmcp xrender
USES= motif
+LIB_DEPENDS= libpng.so:graphics/png \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libexpat.so:textproc/expat2 \
+ libfreetype.so:print/freetype2
PLIST_FILES= bin/xforward man/man1/xforward.1.gz
+OPTIONS_DEFINE= STATIC
+STATIC_ALL_TARGET= all-static
+STATIC_INSTALL_TARGET= install-static
+STATIC_PLIST_FILES= bin/xforward-static
+
.include <bsd.port.mk>
Modified: head/x11/xforward/files/patch-Makefile
==============================================================================
--- head/x11/xforward/files/patch-Makefile Wed May 4 03:06:58 2016 (r414577)
+++ head/x11/xforward/files/patch-Makefile Wed May 4 03:12:35 2016 (r414578)
@@ -1,6 +1,6 @@
--- Makefile.orig 1993-06-04 19:32:01.000000000 -0700
-+++ Makefile 2012-04-27 13:01:33.079482669 -0700
-@@ -18,17 +18,17 @@
++++ Makefile 2016-04-29 22:53:07.305978000 -0700
+@@ -18,17 +18,19 @@
# MANDIR is where the manual page will be installed.
DESTDIR=
@@ -20,6 +20,40 @@
+INCFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+LIBS= -lXm -lXt -lX11 -lXext
++LIBS_STATIC= -lXm -lXmu -lXt -lXext -lSM -lICE -lpng16 -lz -lm -ljpeg -lXp -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lX11 -lXau -lxcb -lXdmcp -lXau -lXft -lXrender
++
CFLAGS= ${INCFLAGS} -O
+@@ -39,20 +41,30 @@
+ AUXFILES= README NOTICE Makefile xforward.1
+
+ PROGS = xforward
++PROGS_STATIC = xforward-static
+
++all-static: all ${PROGS_STATIC}
++
+ all: ${PROGS}
+
+ xforward: xforward.o
+ cc ${LDFLAGS} xforward.o -o xforward ${LIBS}
+
++xforward-static: xforward.o
++ cc ${LDFLAGS} -static xforward.o -o xforward-static ${LIBS_STATIC}
++
+ xforward.o: xforward.c
+ cc -c ${CFLAGS} xforward.c
+
+ install: ${PROGS}
+ install -c xforward ${DESTDIR}${BINDIR}/xforward
+ install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
++
++install-static: install ${PROGS_STATIC}
++ install -c xforward-static ${DESTDIR}${BINDIR}/xforward-static
++
+ clean: ;
+- rm -f *~ *.o core ${PROGS}
++ rm -f *~ *.o core ${PROGS} ${PROGS_STATIC}
+
+ center:
+ #load ${LDFLAGS} ${LIBS}
More information about the svn-ports-all
mailing list