From owner-svn-ports-all@freebsd.org Wed May 4 03:12:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B724B2C651; Wed, 4 May 2016 03:12:37 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C40261772; Wed, 4 May 2016 03:12:36 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u443CZGC000549; Wed, 4 May 2016 03:12:35 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u443CZxP000547; Wed, 4 May 2016 03:12:35 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201605040312.u443CZxP000547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 4 May 2016 03:12:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414578 - in head/x11/xforward: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2016 03:12:37 -0000 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 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}