Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Nov 2013 23:12:40 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334539 - head/graphics/lcms2
Message-ID:  <201311212312.rALNCex2003444@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Nov 21 23:12:39 2013
New Revision: 334539
URL: http://svnweb.freebsd.org/changeset/ports/334539

Log:
  - Convert to new LIB_DEPENDS format
  - Convert to new options helper
  - Support STAGEDIR

Modified:
  head/graphics/lcms2/Makefile
  head/graphics/lcms2/pkg-plist   (contents, props changed)

Modified: head/graphics/lcms2/Makefile
==============================================================================
--- head/graphics/lcms2/Makefile	Thu Nov 21 23:12:35 2013	(r334538)
+++ head/graphics/lcms2/Makefile	Thu Nov 21 23:12:39 2013	(r334539)
@@ -13,6 +13,7 @@ COMMENT=	Accurate, fast, and small-footp
 LICENSE=	MIT
 
 OPTIONS_DEFINE=	DOCS JPEGICC TIFFICC
+OPTIONS_SUB=	yes
 JPEGICC_DESC=	Build color profile applier for JPEG
 TIFFICC_DESC=	Build color profile applier for TIFF
 
@@ -22,34 +23,25 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack lthack
 USE_LDCONFIG=	yes
 
-MAN1=		linkicc.1 psicc.1 transicc.1
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 UTILS=		linkicc psicc transicc
 
-NO_STAGE=	yes
+JPEGICC_CONFIGURE_OFF=	--without-jpeg
+JPEGICC_CONFIGURE_ON=	--with-jpeg=${LOCALBASE}
+JPEGICC_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+TIFFICC_CONFIGURE_OFF=	--without-tiff
+TIFFICC_CONFIGURE_ON=	--with-tiff=${LOCALBASE}
+TIFFICC_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJPEGICC}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--with-jpeg=${LOCALBASE}
-MAN1+=		jpgicc.1
-PLIST_SUB+=	JPEGICC=""
 UTILS+=		jpgicc
-.else
-CONFIGURE_ARGS+=--without-jpeg
-PLIST_SUB+=	JPEGICC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFFICC}
-LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
-CONFIGURE_ARGS=	--with-tiff=${LOCALBASE}
-MAN1+=		tificc.1
-PLIST_SUB+=	TIFFICC=""
 UTILS+=		tificc
-.else
-CONFIGURE_ARGS+=--without-tiff
-PLIST_SUB+=	TIFFICC="@comment "
 .endif
 
 post-patch:
@@ -65,10 +57,10 @@ post-configure:
 	@${REINPLACE_CMD} -E -e '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
 
 post-install:
-	cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${MANPREFIX}/man/man1/
+	cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${STAGEDIR}${PREFIX}/man/man1/
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}/
 .endif
 
 regression-test test: build

Modified: head/graphics/lcms2/pkg-plist
==============================================================================
--- head/graphics/lcms2/pkg-plist	Thu Nov 21 23:12:35 2013	(r334538)
+++ head/graphics/lcms2/pkg-plist	Thu Nov 21 23:12:39 2013	(r334539)
@@ -8,6 +8,11 @@ include/lcms2_plugin.h
 lib/liblcms2.so
 lib/liblcms2.so.2
 libdata/pkgconfig/lcms2.pc
+%%JPEGICC%%man/man1/jpgicc.1.gz
+man/man1/linkicc.1.gz
+man/man1/psicc.1.gz
+%%TIFFICC%%man/man1/tificc.1.gz
+man/man1/transicc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% API.pdf
 %%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% Plugin API.pdf
 %%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% tutorial.pdf



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