Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Nov 2012 20:50:04 +0000 (UTC)
From:      Wesley Shields <wxs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307730 - head/graphics/pngwriter
Message-ID:  <201211242050.qAOKo4Nf021368@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wxs
Date: Sat Nov 24 20:50:04 2012
New Revision: 307730
URL: http://svnweb.freebsd.org/changeset/ports/307730

Log:
  Convert to new options.
  Fix comment and cleanup dependencies.
  Assign maintainer to submitter.
  
  PR:		ports/173588
  Submitted by:	nemysis <nemysis@gmx.ch>
  Feature safe:	yes

Modified:
  head/graphics/pngwriter/Makefile   (contents, props changed)

Modified: head/graphics/pngwriter/Makefile
==============================================================================
--- head/graphics/pngwriter/Makefile	Sat Nov 24 20:15:49 2012	(r307729)
+++ head/graphics/pngwriter/Makefile	Sat Nov 24 20:50:04 2012	(r307730)
@@ -12,20 +12,18 @@ PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A C++ library for creating PNG images
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	C++ library for creating PNG images
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype:${PORTSDIR}/print/freetype2
 
 USE_PKGCONFIG=	yes
 
-BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 CXXFLAGS+=	`pkg-config --cflags freetype2 libpng15` -I${LOCALBASE}/include
 
-PORTDOCS=	*
-PORTEXAMPLES=	*
 PLIST_FILES=	include/pngwriter.h \
 		lib/libpngwriter.a \
 		%%DATADIR%%/fonts/FreeMonoBold.ttf \
@@ -33,24 +31,32 @@ PLIST_FILES=	include/pngwriter.h \
 PLIST_DIRS=	%%DATADIR%%/fonts \
 		%%DATADIR%%
 
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
 post-extract:
 	@${FIND} ${WRKSRC} -name "\.*" -delete
 
 do-build:
-	cd ${BUILD_WRKSRC} \
+	cd ${WRKSRC}/src \
 		&& ${CXX} ${CXXFLAGS} -c pngwriter.cc -o pngwriter.o \
 		&& ${AR} rv libpngwriter.a pngwriter.o
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/pngwriter.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/libpngwriter.a ${PREFIX}/lib
-	@${MKDIR} ${DATADIR}/fonts
-	@(cd ${WRKSRC}/fonts && ${COPYTREE_SHARE} . ${DATADIR}/fonts)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} fonts ${DATADIR})
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR})
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>



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