From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 28 08:57:57 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 AE2AB467;
 Mon, 28 Apr 2014 08:57:57 +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 80EEF1CF1;
 Mon, 28 Apr 2014 08:57:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3S8vvlL036409;
 Mon, 28 Apr 2014 08:57:57 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3S8vvCU036408;
 Mon, 28 Apr 2014 08:57:57 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404280857.s3S8vvCU036408@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 28 Apr 2014 08:57:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352474 - head/graphics/metapixel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Apr 2014 08:57:57 -0000

Author: pawel
Date: Mon Apr 28 08:57:57 2014
New Revision: 352474
URL: http://svnweb.freebsd.org/changeset/ports/352474
QAT: https://qat.redports.org/buildarchive/r352474/

Log:
  - Add staging support
  - Convert to new LIB_DEPENDS format
  - Fix few shebangs

Modified:
  head/graphics/metapixel/Makefile

Modified: head/graphics/metapixel/Makefile
==============================================================================
--- head/graphics/metapixel/Makefile	Mon Apr 28 08:56:09 2014	(r352473)
+++ head/graphics/metapixel/Makefile	Mon Apr 28 08:57:57 2014	(r352474)
@@ -3,7 +3,7 @@
 
 PORTNAME=	metapixel
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.complang.tuwien.ac.at/schani/metapixel/files/ \
 		http://mirror.roe.ch/dist/metapixel/
@@ -13,43 +13,38 @@ COMMENT=	Photomosaic generator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
+LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png
 
 CPPFLAGS+=	$$(libpng-config --I_opts) -I${LOCALBASE}/include -I.
 LDFLAGS+=	$$(libpng-config --L_opts) -L${LOCALBASE}/lib
-USES=		gmake
+USES=		gmake shebangfix
+SHEBANG_FILES=	metapixel-prepare metapixel-sizesort
 
-MAN1=		metapixel.1
 PLIST_FILES=	bin/metapixel \
 		bin/metapixel-convert \
 		bin/metapixel-imagesize \
 		bin/metapixel-prepare \
-		bin/metapixel-sizesort
+		bin/metapixel-sizesort \
+		man/man1/metapixel.1.gz
 PORTDOCS=	NEWS README
 PORTEXAMPLES=	metapixelrc
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${RM} ${WRKSRC}/getopt.h
 
 do-install:
-	cd ${WRKSRC}/ && \
-		${INSTALL_PROGRAM} metapixel metapixel-convert metapixel-imagesize ${PREFIX}/bin/ && \
-		${INSTALL_SCRIPT} metapixel-prepare metapixel-sizesort ${PREFIX}/bin/ && \
-		${INSTALL_MAN} metapixel.1 ${PREFIX}/man/man1/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
-.endif
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} metapixel metapixel-convert \
+		metapixel-imagesize ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} metapixel-prepare \
+		metapixel-sizesort ${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>