From owner-svn-ports-all@freebsd.org Wed Apr 13 17:26:43 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 3B608B0FBC9; Wed, 13 Apr 2016 17:26:43 +0000 (UTC) (envelope-from mi@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 1560610B4; Wed, 13 Apr 2016 17:26:43 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3DHQgYC026603; Wed, 13 Apr 2016 17:26:42 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3DHQftc026599; Wed, 13 Apr 2016 17:26:41 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201604131726.u3DHQftc026599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Wed, 13 Apr 2016 17:26:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413224 - in head/www/nostromo: . 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.21 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, 13 Apr 2016 17:26:43 -0000 Author: mi Date: Wed Apr 13 17:26:41 2016 New Revision: 413224 URL: https://svnweb.freebsd.org/changeset/ports/413224 Log: Patch the upstream's install-targets instead of providing our own. No (real) changes to package. Modified: head/www/nostromo/Makefile head/www/nostromo/files/patch-src-nhttpd-Makefile head/www/nostromo/files/patch-src-tools-Makefile head/www/nostromo/pkg-plist Modified: head/www/nostromo/Makefile ============================================================================== --- head/www/nostromo/Makefile Wed Apr 13 17:26:34 2016 (r413223) +++ head/www/nostromo/Makefile Wed Apr 13 17:26:41 2016 (r413224) @@ -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 Modified: head/www/nostromo/files/patch-src-nhttpd-Makefile ============================================================================== --- head/www/nostromo/files/patch-src-nhttpd-Makefile Wed Apr 13 17:26:34 2016 (r413223) +++ head/www/nostromo/files/patch-src-nhttpd-Makefile Wed Apr 13 17:26:41 2016 (r413224) @@ -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 Modified: head/www/nostromo/files/patch-src-tools-Makefile ============================================================================== --- head/www/nostromo/files/patch-src-tools-Makefile Wed Apr 13 17:26:34 2016 (r413223) +++ head/www/nostromo/files/patch-src-tools-Makefile Wed Apr 13 17:26:41 2016 (r413224) @@ -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 Modified: head/www/nostromo/pkg-plist ============================================================================== --- head/www/nostromo/pkg-plist Wed Apr 13 17:26:34 2016 (r413223) +++ head/www/nostromo/pkg-plist Wed Apr 13 17:26:41 2016 (r413224) @@ -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