diff options
| author | mi <mi@FreeBSD.org> | 2016-04-14 01:26:41 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2016-04-14 01:26:41 +0800 |
| commit | 67f4fdfdc9eae360adcf0ad56cdb54cf0cf97cd8 (patch) | |
| tree | 36d81461bce37ce707640055d2faf8953e12b175 /www/nostromo | |
| parent | 522dddd190b22e5c9c398724276b04e9b75286af (diff) | |
| download | freebsd-ports-gnome-67f4fdfdc9eae360adcf0ad56cdb54cf0cf97cd8.tar.gz freebsd-ports-gnome-67f4fdfdc9eae360adcf0ad56cdb54cf0cf97cd8.tar.zst freebsd-ports-gnome-67f4fdfdc9eae360adcf0ad56cdb54cf0cf97cd8.zip | |
Patch the upstream's install-targets instead of providing our own.
No (real) changes to package.
Diffstat (limited to 'www/nostromo')
| -rw-r--r-- | www/nostromo/Makefile | 31 | ||||
| -rw-r--r-- | www/nostromo/files/patch-src-nhttpd-Makefile | 3 | ||||
| -rw-r--r-- | www/nostromo/files/patch-src-tools-Makefile | 3 | ||||
| -rw-r--r-- | www/nostromo/pkg-plist | 2 |
4 files changed, 12 insertions, 27 deletions
diff --git a/www/nostromo/Makefile b/www/nostromo/Makefile index 1d2cd7f35570..9051cab53797 100644 --- a/www/nostromo/Makefile +++ b/www/nostromo/Makefile @@ -17,35 +17,18 @@ NOSTROMO_LOGDIR_PERMS?= 0775 USE_OPENSSL= yes USE_RC_SUBR= nostromo +USES= uidfix -MAKE_ENV?= MAKEOBJDIR=. PREFIX=${PREFIX} NOSTROMO_DIR=${NOSTROMO_DIR} +MAKE_ENV?= MAKEOBJDIR=. NOSTROMO_DIR=${NOSTROMO_DIR} MANDIR=${PREFIX}/man/man PLIST_SUB+= NOSTROMODIR="${NOSTROMO_DIR}" NOSTROMOLOGDIR="${NOSTROMO_LOGDIR}" post-extract: @${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \ - ${WRKSRC}/src/nhttpd/nhttpd.8 - @${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \ - ${WRKSRC}/src/nhttpd/main.c - @${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \ + ${WRKSRC}/src/nhttpd/nhttpd.8 \ + ${WRKSRC}/src/nhttpd/main.c \ ${WRKSRC}/conf/nhttpd.conf-dist - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/nhttpd/nhttpd ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/src/tools/crypt ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/src/nhttpd/nhttpd.8 ${STAGEDIR}${PREFIX}/man/man8 - @${MKDIR} ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR} - @${MKDIR} ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/conf - @${MKDIR} -m ${NOSTROMO_LOGDIR_PERMS} -p ${STAGEDIR}${PREFIX}/${NOSTROMO_LOGDIR} - ${INSTALL_DATA} ${WRKSRC}/conf/mimes ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/conf - ${INSTALL_DATA} ${WRKSRC}/conf/nhttpd.conf-dist ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf.sample - @${MKDIR} ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/htdocs - ${INSTALL_DATA} ${WRKSRC}/htdocs/index.html ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/htdocs - ${INSTALL_DATA} ${WRKSRC}/htdocs/nostromo.gif ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/htdocs - @${MKDIR} ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/htdocs/cgi-bin - ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/cgi-bin/printenv \ - ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/htdocs/cgi-bin - @${MKDIR} ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/icons - ${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/icons - ${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/icons + @${REINPLACE_CMD} -e "s@/var/nostromo@${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}@g" \ + -e "s@-o [^ ]* -g [^ ]*@ -o ${BINOWN} -g ${BINGRP}@" \ + ${WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/www/nostromo/files/patch-src-nhttpd-Makefile b/www/nostromo/files/patch-src-nhttpd-Makefile index a87a9023fae6..64f8e6112493 100644 --- a/www/nostromo/files/patch-src-nhttpd-Makefile +++ b/www/nostromo/files/patch-src-nhttpd-Makefile @@ -1,7 +1,8 @@ --- src/nhttpd/Makefile 2016-04-12 15:02:06.000000000 -0400 +++ src/nhttpd/Makefile 2016-04-13 12:29:49.861046000 -0400 @@ -13,8 +13,15 @@ - BINOWN= root +-BINOWN= root ++BINOWN?= root BINMOD= 0555 -BINDIR= /usr/local/sbin +BINDIR= ${PREFIX}/sbin diff --git a/www/nostromo/files/patch-src-tools-Makefile b/www/nostromo/files/patch-src-tools-Makefile index 4b0662726dc1..8d5aee162a3e 100644 --- a/www/nostromo/files/patch-src-tools-Makefile +++ b/www/nostromo/files/patch-src-tools-Makefile @@ -1,7 +1,8 @@ --- src/tools/Makefile 2016-04-12 15:02:58.000000000 -0400 +++ src/tools/Makefile 2016-04-13 12:33:40.546452000 -0400 @@ -12,5 +12,5 @@ - BINOWN= root +-BINOWN= root ++BINOWN?= root BINMOD= 0555 -BINDIR= /usr/local/sbin +BINDIR= ${PREFIX}/sbin diff --git a/www/nostromo/pkg-plist b/www/nostromo/pkg-plist index fbf1d44fe8bd..1bd5555dedad 100644 --- a/www/nostromo/pkg-plist +++ b/www/nostromo/pkg-plist @@ -2,7 +2,7 @@ man/man8/nhttpd.8.gz sbin/crypt sbin/nhttpd %%NOSTROMODIR%%/conf/mimes -@sample %%NOSTROMODIR%%/conf/nhttpd.conf.sample +@sample %%NOSTROMODIR%%/conf/nhttpd.conf-dist %%NOSTROMODIR%%/htdocs/index.html %%NOSTROMODIR%%/htdocs/nostromo.gif %%NOSTROMODIR%%/htdocs/cgi-bin/printenv |