From owner-svn-ports-all@FreeBSD.ORG  Sat Nov 10 11:57:19 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 754D9458;
 Sat, 10 Nov 2012 11:57:19 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5AF6E8FC0A;
 Sat, 10 Nov 2012 11:57:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAABvJXb000530;
 Sat, 10 Nov 2012 11:57:19 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAABvJZK000529;
 Sat, 10 Nov 2012 11:57:19 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201211101157.qAABvJZK000529@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 10 Nov 2012 11:57:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307271 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
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: Sat, 10 Nov 2012 11:57:19 -0000

Author: pawel
Date: Sat Nov 10 11:57:18 2012
New Revision: 307271
URL: http://svnweb.freebsd.org/changeset/ports/307271

Log:
  - Add LICENSE
  - Support PORTEXAMPLES
  
  While I'm here:
  - Add missing deps this package links to
  - Fix COMMENT
  
  PR:		ports/172019
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Feature safe:	yes

Modified:
  head/graphics/metapixel/Makefile

Modified: head/graphics/metapixel/Makefile
==============================================================================
--- head/graphics/metapixel/Makefile	Sat Nov 10 11:42:06 2012	(r307270)
+++ head/graphics/metapixel/Makefile	Sat Nov 10 11:57:18 2012	(r307271)
@@ -1,7 +1,4 @@
-# Ports collection makefile for:	metapixel
-# Date created:			2002-05-23
-# Whom:				Tilman Linneweh <arved@FreeBSD.org>
-#
+# Created by: Tilman Linneweh <arved@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	metapixel
@@ -12,22 +9,31 @@ MASTER_SITES=	http://www.complang.tuwien
 		http://mirror.roe.ch/dist/metapixel/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A photomosaic generator
+COMMENT=	Photomosaic generator
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		gif.5:${PORTSDIR}/graphics/giflib
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		gif:${PORTSDIR}/graphics/giflib \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		png15:${PORTSDIR}/graphics/png \
+		xcb:${PORTSDIR}/x11/libxcb
 
 USE_GMAKE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I. -I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_XORG=	ice sm x11 xau xdmcp
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	$$(libpng-config --I_opts) -I${LOCALBASE}/include -I.
+LDFLAGS+=	$$(libpng-config --L_opts) -L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \
-		bin/metapixel-prepare bin/metapixel-sizesort \
-		share/examples/metapixel/metapixelrc
-PLIST_DIRS=	share/examples/metapixel
-PORTDOCS=	README NEWS
 MAN1=		metapixel.1
+PORTDOCS=	README NEWS
+PORTEXAMPLES=	metapixelrc
+PLIST_FILES=	bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \
+		bin/metapixel-prepare bin/metapixel-sizesort
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${RM} ${WRKSRC}/getopt.h
@@ -38,12 +44,14 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/metapixel-imagesize ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${PREFIX}/man/man1
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/metapixelrc ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${MANPREFIX}/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
 
 .include <bsd.port.mk>