Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jun 2015 19:52:43 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388990 - head/www/nostromo
Message-ID:  <201506091952.t59Jqh4g084741@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Jun  9 19:52:43 2015
New Revision: 388990
URL: https://svnweb.freebsd.org/changeset/ports/388990

Log:
  - Fix shebangs
  - Fix program files installation
  - Unsilence install
  
  MFH:		2015Q2 (blanket)

Modified:
  head/www/nostromo/Makefile

Modified: head/www/nostromo/Makefile
==============================================================================
--- head/www/nostromo/Makefile	Tue Jun  9 19:52:41 2015	(r388989)
+++ head/www/nostromo/Makefile	Tue Jun  9 19:52:43 2015	(r388990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nostromo
 PORTVERSION=	1.9.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.nazgul.ch/dev/
 
@@ -19,6 +19,9 @@ NOSTROMO_LOGDIR_PERMS?=	0775
 USE_OPENSSL=	yes
 USE_RC_SUBR=	nostromo
 
+USES=		shebangfix
+SHEBANG_FILES=	htdocs/cgi-bin/printenv
+
 MAKE_ENV?=	MAKEOBJDIR=. PREFIX=${PREFIX} NOSTROMO_DIR=${NOSTROMO_DIR}
 PLIST_SUB+=	NOSTROMODIR="${NOSTROMO_DIR}" NOSTROMOLOGDIR="${NOSTROMO_LOGDIR}"
 
@@ -31,22 +34,22 @@ post-extract:
 		${WRKSRC}/conf/nhttpd.conf-dist
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/src/nhttpd/nhttpd ${STAGEDIR}${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/src/tools/crypt ${STAGEDIR}${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/src/nhttpd/nhttpd.8 ${STAGEDIR}${PREFIX}/man/man8
+	${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
+	${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
+	${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 \
+	${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
+	${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}/icons
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506091952.t59Jqh4g084741>