svn commit: r334538 - in head/graphics/lcms: . files

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Thu Nov 21 23:12:38 UTC 2013


Author: sunpoet
Date: Thu Nov 21 23:12:35 2013
New Revision: 334538
URL: http://svnweb.freebsd.org/changeset/ports/334538

Log:
  - Add LICENSE
  - Convert to new LIB_DEPENDS format
  - Convert to new options helper
  - Remove unnecessary patch: already replaced by REINPLACE_CMD
  - Support STAGEDIR

Deleted:
  head/graphics/lcms/files/patch-test-static
Modified:
  head/graphics/lcms/Makefile
  head/graphics/lcms/pkg-plist   (contents, props changed)

Modified: head/graphics/lcms/Makefile
==============================================================================
--- head/graphics/lcms/Makefile	Thu Nov 21 23:12:31 2013	(r334537)
+++ head/graphics/lcms/Makefile	Thu Nov 21 23:12:35 2013	(r334538)
@@ -12,7 +12,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Light Color Management System -- a color management library
 
+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,32 +25,19 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack lthack
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJPEGICC}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--with-jpeg=${LOCALBASE}
-MAN1+=		jpegicc.1
-PLIST_SUB+=	JPEGICC=""
-.else
-CONFIGURE_ARGS+=--without-jpeg
-PLIST_SUB+=	JPEGICC="@comment "
-.endif
+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
 
-.if ${PORT_OPTIONS:MTIFFICC}
-LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
-CONFIGURE_ARGS+=--with-tiff=${LOCALBASE}
-MAN1+=		tifficc.1
-PLIST_SUB+=	TIFFICC=""
-.else
-CONFIGURE_ARGS+=--without-tiff
-PLIST_SUB+=	TIFFICC="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| python samples||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|^testcms_LDFLAGS = .*$$|& -static|' ${WRKSRC}/testbed/Makefile.in
+#	@${REINPLACE_CMD} -e '/^#ifdef __sgi/d; /^#include "sgidefs.h"/d' ${WRKSRC}/include/icc34.h.in
+	@${REINPLACE_CMD} -e '/^testcms_LDFLAGS = / s|$$| -static|' ${WRKSRC}/testbed/Makefile.in
 .if !${PORT_OPTIONS:MJPEGICC}
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| jpegicc||' ${WRKSRC}/Makefile.in
 .endif
@@ -61,9 +51,9 @@ post-configure:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} doc/LCMSAPI.TXT doc/TUTORIAL.TXT tifficc/tifficc.c \
-		jpegicc/jpegicc.c jpegicc/iccjpeg.c samples/wtpt.c samples/icctrans.c ${DOCSDIR}/
+		jpegicc/jpegicc.c jpegicc/iccjpeg.c samples/wtpt.c samples/icctrans.c ${STAGEDIR}${DOCSDIR}/
 .endif
 
 regression-test test: build

Modified: head/graphics/lcms/pkg-plist
==============================================================================
--- head/graphics/lcms/pkg-plist	Thu Nov 21 23:12:31 2013	(r334537)
+++ head/graphics/lcms/pkg-plist	Thu Nov 21 23:12:35 2013	(r334538)
@@ -6,6 +6,8 @@ include/lcms.h
 lib/liblcms.so
 lib/liblcms.so.1
 libdata/pkgconfig/lcms.pc
+%%JPEGICC%%man/man1/jpegicc.1.gz
+%%TIFFICC%%man/man1/tifficc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/LCMSAPI.TXT
 %%PORTDOCS%%%%DOCSDIR%%/TUTORIAL.TXT
 %%PORTDOCS%%%%DOCSDIR%%/iccjpeg.c


More information about the svn-ports-all mailing list