From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 25 02:52:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E5985318;
 Wed, 25 Jun 2014 02:52:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 B87532D32;
 Wed, 25 Jun 2014 02:52:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5P2q6jr013957;
 Wed, 25 Jun 2014 02:52:06 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5P2q65b013955;
 Wed, 25 Jun 2014 02:52:06 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201406250252.s5P2q65b013955@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Wed, 25 Jun 2014 02:52:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359178 - head/graphics/npretty
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jun 2014 02:52:07 -0000

Author: jhale
Date: Wed Jun 25 02:52:06 2014
New Revision: 359178
URL: http://svnweb.freebsd.org/changeset/ports/359178
QAT: https://qat.redports.org/buildarchive/r359178/

Log:
  - Support staging
  - Fix shebangs
  - NOPORTDOCS -> DOCS option
  - Add LICENSE
  
  Approved by:	portmgr (blanket approval)

Modified:
  head/graphics/npretty/Makefile
  head/graphics/npretty/pkg-plist

Modified: head/graphics/npretty/Makefile
==============================================================================
--- head/graphics/npretty/Makefile	Wed Jun 25 02:21:37 2014	(r359177)
+++ head/graphics/npretty/Makefile	Wed Jun 25 02:52:06 2014	(r359178)
@@ -11,31 +11,31 @@ MASTER_SITES=	http://www.pulia.nu/code/p
 MAINTAINER=	peter@pean.org
 COMMENT=	Simple web-gallery generator written in perl
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		convert:${PORTSDIR}/graphics/ImageMagick \
 		p5-forks>=0:${PORTSDIR}/devel/p5-forks
-
-LIB_DEPENDS+=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	npretty.pl
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-patch:
 	@ ${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/npretty.pl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/npretty.pl ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/npretty
-	${INSTALL_DATA} ${WRKSRC}/novideo.gif ${PREFIX}/etc/npretty
-	${INSTALL_DATA} ${WRKSRC}/npretty_template.tpl ${PREFIX}/etc/npretty
-	${INSTALL_DATA} ${WRKSRC}/npretty.conf ${PREFIX}/etc/npretty
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in BUGS COPYING README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/npretty.pl ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/npretty
+	${INSTALL_DATA} ${WRKSRC}/novideo.gif ${STAGEDIR}${PREFIX}/etc/npretty
+	${INSTALL_DATA} ${WRKSRC}/npretty_template.tpl ${STAGEDIR}${PREFIX}/etc/npretty
+	${INSTALL_DATA} ${WRKSRC}/npretty.conf ${STAGEDIR}${PREFIX}/etc/npretty
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in BUGS README
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/npretty/pkg-plist
==============================================================================
--- head/graphics/npretty/pkg-plist	Wed Jun 25 02:21:37 2014	(r359177)
+++ head/graphics/npretty/pkg-plist	Wed Jun 25 02:52:06 2014	(r359178)
@@ -3,7 +3,6 @@ etc/npretty/npretty.conf
 etc/npretty/novideo.gif
 etc/npretty/npretty_template.tpl
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm etc/npretty
 %%PORTDOCS%%@dirrm %%DOCSDIR%%