Date: Wed, 4 Jun 2014 10:30:30 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356454 - in head/net/netpipes: . files Message-ID: <201406041030.s54AUU9D018378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Wed Jun 4 10:30:30 2014 New Revision: 356454 URL: http://svnweb.freebsd.org/changeset/ports/356454 QAT: https://qat.redports.org/buildarchive/r356454/ Log: - Stage support PR: 189645 Added: head/net/netpipes/files/patch-Makefile (contents, props changed) Deleted: head/net/netpipes/files/patch-aa Modified: head/net/netpipes/Makefile head/net/netpipes/pkg-plist Modified: head/net/netpipes/Makefile ============================================================================== --- head/net/netpipes/Makefile Wed Jun 4 10:11:47 2014 (r356453) +++ head/net/netpipes/Makefile Wed Jun 4 10:30:30 2014 (r356454) @@ -14,8 +14,8 @@ COMMENT= A group of shell utilities to c CONFLICTS= timelimit-[0-9]* NO_WRKSUBDIR= yes -MAN1= faucet.1 hose.1 sockdown.1 getpeername.1 encapsulate.1 \ - timelimit.1 netpipes.1 -NO_STAGE= yes +do-install: + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKDIR} STAGEDIR=${STAGEDIR} install + .include <bsd.port.mk> Added: head/net/netpipes/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/netpipes/files/patch-Makefile Wed Jun 4 10:30:30 2014 (r356454) @@ -0,0 +1,67 @@ +--- Makefile.orig 1998-10-29 07:00:03.000000000 +1030 ++++ Makefile 2014-05-11 13:28:21.742500328 +0930 +@@ -17,7 +17,7 @@ + + # You probably want to change this: + #INSTROOT = ${HOME} +-INSTROOT = /depot/collections0/netpipes4.1 ++INSTROOT = ${STAGEDIR}/${PREFIX} + #INSTROOT = /usr/local + INSTBIN = ${INSTROOT}/bin + INSTMAN = ${INSTROOT}/man +@@ -59,7 +59,7 @@ + #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS) + + # Linux (developed with RedHat 4.2, libc5) +-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS) ++#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS) + + # SGI + #CFLAGS = -DSYSV $(CDEBUGFLAGS) +@@ -71,7 +71,7 @@ + #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS) + + # FreeBSD +-#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS) ++CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS) + + # AIX 4.1.4 and 3.2.5 + #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS) +@@ -86,7 +86,7 @@ + + # gcc can handle both -O and -g at once + #CDEBUGFLAGS = -g # -Wall -DDEBUG +-CDEBUGFLAGS = -O ++#CDEBUGFLAGS = -O + + ###################################################################### + +@@ -104,8 +104,7 @@ + SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto + + MANPAGES = netpipes.1 faucet.1 hose.1 \ +- sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \ +- ssl-auth.1 ++ sockdown.1 getpeername.1 timelimit.1 encapsulate.1 + PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate + + all : ${PROGRAMS} +@@ -138,15 +137,9 @@ + ${CC} ${CFLAGS} ${SSLINC} -c $< + + install : all +- test -d ${INSTROOT} || mkdir ${INSTROOT} +- test -d ${INSTBIN} || mkdir ${INSTBIN} +- cp ${PROGRAMS} ${INSTBIN}/ +- - rm -f ${INSTBIN}/getsockname +- ln -s getpeername ${INSTBIN}/getsockname +- - [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/ +- test -d ${INSTMAN} || mkdir ${INSTMAN} +- test -d ${INSTMAN}/man1 || mkdir ${INSTMAN}/man1 +- cp ${MANPAGES} ${INSTMAN}/man1/ ++ ${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/ ++ ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/ ++ ln -f -s getpeername ${INSTBIN}/getsockname + + # + Modified: head/net/netpipes/pkg-plist ============================================================================== --- head/net/netpipes/pkg-plist Wed Jun 4 10:11:47 2014 (r356453) +++ head/net/netpipes/pkg-plist Wed Jun 4 10:30:30 2014 (r356454) @@ -5,3 +5,11 @@ bin/getsockname bin/hose bin/sockdown bin/timelimit +man/man1/encapsulate.1.gz +man/man1/faucet.1.gz +man/man1/getpeername.1.gz +man/man1/hose.1.gz +man/man1/netpipes.1.gz +man/man1/sockdown.1.gz +man/man1/timelimit.1.gz +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406041030.s54AUU9D018378>