diff options
| -rw-r--r-- | net/44bsd-rdist/Makefile | 11 | ||||
| -rw-r--r-- | net/rdist6/Makefile | 12 | ||||
| -rw-r--r-- | net/rdist6/files/patch-ad | 6 | ||||
| -rw-r--r-- | net/rdist6/files/patch-doc-Makefile.real | 11 | ||||
| -rw-r--r-- | net/rdist6/files/patch-src-Makefile.real | 23 | ||||
| -rw-r--r-- | net/rdist6/pkg-plist | 9 |
6 files changed, 56 insertions, 16 deletions
diff --git a/net/44bsd-rdist/Makefile b/net/44bsd-rdist/Makefile index 6956be46b655..4274b59eba7e 100644 --- a/net/44bsd-rdist/Makefile +++ b/net/44bsd-rdist/Makefile @@ -11,11 +11,11 @@ MAINTAINER= cy@FreeBSD.org COMMENT= The traditional 4.4BSD rdist -USE_BZIP2= yes +USES= tar:bzip2 NO_WRKSUBDIR= yes -MAN1= 44bsd-rdist.1 -PLIST_FILES= bin/44bsd-rdist +PLIST_FILES= bin/44bsd-rdist \ + man/man1/44bsd-rdist.1.gz .include <bsd.port.pre.mk> @@ -23,13 +23,12 @@ PLIST_FILES= bin/44bsd-rdist BUILD_DEPENDS= rcs:${PORTSDIR}/devel/rcs57 .endif -NO_STAGE= yes post-extract: cd ${WRKSRC} ; co RCS/*,v do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rdist ${PREFIX}/bin/44bsd-rdist - ${INSTALL_MAN} ${WRKSRC}/rdist.1 ${PREFIX}/man/man1/44bsd-rdist.1 + ${INSTALL_PROGRAM} ${WRKSRC}/rdist ${STAGEDIR}${PREFIX}/bin/44bsd-rdist + ${INSTALL_MAN} ${WRKSRC}/rdist.1 ${STAGEDIR}${PREFIX}/man/man1/44bsd-rdist.1 tarup: -cd ${WRKSRC} ; ${RM} * diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index 652a28dab390..a6b3152cdf2e 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -8,21 +8,19 @@ CATEGORIES= net MASTER_SITES= http://www.magnicomp.com/download/rdist/ \ ftp://ftp.sunet.se/pub/unix/admin/mirror-magnicomp/download/rdist/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cy@FreeBSD.org COMMENT= Network file distribution/synchronisation utility # To avoid confusion with /usr/bin/rdist, you may prefer otherwise. RDIST_NAME?= rdist6 INSTALL_TARGET= install install.man -MAKE_ENV= BUILD_OPT="${CFLAGS}" BUILD_CLIENT=${RDIST_NAME} -MAN1= ${RDIST_NAME}.1 -MAN8= rdistd.8 +MAKE_ENV= BUILD_OPT="${CFLAGS}" BUILD_CLIENT=${RDIST_NAME} \ + STAGEDIR=${STAGEDIR} PLIST_SUB= RDIST_NAME=${RDIST_NAME} -NO_STAGE= yes post-install: - @${STRIP_CMD} ${PREFIX}/bin/${RDIST_NAME} - @${STRIP_CMD} ${PREFIX}/bin/rdistd + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RDIST_NAME} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rdistd .include <bsd.port.mk> diff --git a/net/rdist6/files/patch-ad b/net/rdist6/files/patch-ad index 7c54833ef8cc..32b13769602b 100644 --- a/net/rdist6/files/patch-ad +++ b/net/rdist6/files/patch-ad @@ -13,7 +13,7 @@ # BIN_DIR variable, you would uncomment the following line # or add your own line. # -! BIN_DIR = $(PREFIX)/bin +! BIN_DIR = ${STAGEDIR}$(PREFIX)/bin ! OPT = $(BUILD_OPT) ! CLIENT = $(BUILD_CLIENT) @@ -33,8 +33,8 @@ # # Site specific Man Page configuration. # -! MAN_1_DIR = $(PREFIX)/man/man1 -! MAN_8_DIR = $(PREFIX)/man/man8 +! MAN_1_DIR = ${STAGEDIR}$(PREFIX)/man/man1 +! MAN_8_DIR = ${STAGEDIR}$(PREFIX)/man/man8 ! MAN_OWNER = bin ! MAN_GROUP = bin #MAN_MODE = 644 diff --git a/net/rdist6/files/patch-doc-Makefile.real b/net/rdist6/files/patch-doc-Makefile.real new file mode 100644 index 000000000000..b8c78aefb724 --- /dev/null +++ b/net/rdist6/files/patch-doc-Makefile.real @@ -0,0 +1,11 @@ +--- doc/Makefile.real.orig 1998-11-09 21:40:06.000000000 -0800 ++++ doc/Makefile.real 2014-05-29 19:32:52.700090356 -0700 +@@ -10,7 +10,7 @@ + + CLIENT_DEST = ${MAN_1_DIR}/${CLIENT}.${MAN_1_SECT} + SERVER_DEST = ${MAN_8_DIR}/${SERVER}.${MAN_8_SECT} +-INSTALL_ARGS = -c -o ${MAN_OWNER} -g ${MAN_GROUP} -m ${MAN_MODE} ++INSTALL_ARGS = -c + + all: + diff --git a/net/rdist6/files/patch-src-Makefile.real b/net/rdist6/files/patch-src-Makefile.real new file mode 100644 index 000000000000..a38e721e7be0 --- /dev/null +++ b/net/rdist6/files/patch-src-Makefile.real @@ -0,0 +1,23 @@ +--- src/Makefile.real.orig 1998-11-09 20:03:46.000000000 -0800 ++++ src/Makefile.real 2014-05-29 19:25:12.420724836 -0700 +@@ -8,7 +8,7 @@ + # $Id: Makefile.real,v 1.12 1998/11/10 04:03:46 mcooper Exp $ + # + +-IN_ARGS = -c -g ${BIN_GROUP} ++IN_ARGS = -c + + HFILES = ../config/config.h ../config/config-data.h \ + ../config/config-def.h ../config/os-$(OS).h \ +@@ -52,9 +52,9 @@ + $(COMMONOBJS) $(MISSINGOBJS) + + install: +- $(INSTALL) ${IN_ARGS} -o $(BIN_OWNER) -m ${RDIST_MODE} \ ++ $(INSTALL) ${IN_ARGS} \ + $(CLIENT_BIN) $(BIN_DIR)/$(CLIENT) +- $(INSTALL) ${IN_ARGS} -o ${BIN_OWNER} -m ${RDISTD_MODE} \ ++ $(INSTALL) ${IN_ARGS} \ + $(SERVER_BIN) $(BIN_DIR)/$(SERVER) + + install.man: diff --git a/net/rdist6/pkg-plist b/net/rdist6/pkg-plist index b31c03e51d7a..36c06e21638a 100644 --- a/net/rdist6/pkg-plist +++ b/net/rdist6/pkg-plist @@ -1,2 +1,11 @@ +@owner root +@group bin +@mode 555 bin/%%RDIST_NAME%% bin/rdistd +@mode 644 +@owner root +@group bin +man/man1/%%RDIST_NAME%%.1.gz +man/man8/rdistd.8.gz + |