[Midnightbsd-cvs] mports [16045] trunk/graphics/liblqr-1: update to new options

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 8 19:07:36 EST 2014


Revision: 16045
          http://svnweb.midnightbsd.org/mports/?rev=16045
Author:   laffer1
Date:     2014-03-08 19:07:35 -0500 (Sat, 08 Mar 2014)
Log Message:
-----------
update to new options

Modified Paths:
--------------
    trunk/graphics/liblqr-1/Makefile
    trunk/graphics/liblqr-1/pkg-plist

Added Paths:
-----------
    trunk/graphics/liblqr-1/files/patch-configure

Modified: trunk/graphics/liblqr-1/Makefile
===================================================================
--- trunk/graphics/liblqr-1/Makefile	2014-03-09 00:01:27 UTC (rev 16044)
+++ trunk/graphics/liblqr-1/Makefile	2014-03-09 00:07:35 UTC (rev 16045)
@@ -3,6 +3,7 @@
 
 PORTNAME=	liblqr-1
 DISTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://liblqr.wdfiles.com/local--files/en:download-page/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -13,38 +14,35 @@
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	glib20 pkgconfig
-USE_GETTEXT=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		gettext gmake pkgconfig
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 # Use GNU89 inline semantics
 USE_CSTD=	gnu89
 
-.if !defined(NOPORTEXAMPLES)
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	EXAMPLES HTMLDOCS
+HTMLDOCS_DESC=	Build and install HTML documentation
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTSDIR=${PORTSDIR}
 .endif
 
-OPTIONS=	HTMLDOCS	"Build and install HTML documentation"	off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_HTMLDOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450
-
-PORTDOCS=	*
+		${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
+PLIST_SUB=	HTMLDOCS=""
+.else
+PLIST_SUB=	HTMLDOCS="@comment "
 .endif
 
 post-patch:
-.if ${OSVERSION} < 3000
-	@${REINPLACE_CMD} -e 's|FVISIBILITY_FLAG=".*"|FVISIBILITY_FLAG=""|' ${WRKSRC}/configure
-.endif
 	@${REINPLACE_CMD} -e '/^lqr_pkgconfigdir/ s|$$(libdir)|$${exec_prefix}/libdata|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr.*chunk\.xsl|${LOCALBASE}/share/xsl/docbook/html/chunk.xsl|' \
@@ -52,23 +50,17 @@
 	@${REINPLACE_CMD} -e 's|/usr.*docbookx.dtd|${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd|' \
 		${WRKSRC}/docs/liblqr_manual.docbook
 
+.if ${PORT_OPTIONS:MHTMLDOCS}
 post-build:
-.if defined(WITH_HTMLDOCS) && !defined(NOPORTDOCS)
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} html
 .endif
 
 post-install:
-.if defined(WITH_HTMLDOCS) && !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}
+.if ${PORT_OPTIONS:MHTMLDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
-.if !exists(${LOCALBASE}/lib/libpngwriter.a)
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: trunk/graphics/liblqr-1/files/patch-configure
===================================================================
--- trunk/graphics/liblqr-1/files/patch-configure	                        (rev 0)
+++ trunk/graphics/liblqr-1/files/patch-configure	2014-03-09 00:07:35 UTC (rev 16045)
@@ -0,0 +1,12 @@
+Fix user-set path envvar confusing libtool
+--- configure.orig	2009-05-12 03:41:59.000000000 +0400
++++ configure	2012-10-17 21:18:41.318049637 +0400
+@@ -19894,7 +19894,7 @@
+ 
+     cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+-
++path=
+ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:

Modified: trunk/graphics/liblqr-1/pkg-plist
===================================================================
--- trunk/graphics/liblqr-1/pkg-plist	2014-03-09 00:01:27 UTC (rev 16044)
+++ trunk/graphics/liblqr-1/pkg-plist	2014-03-09 00:07:35 UTC (rev 16045)
@@ -17,3 +17,107 @@
 libdata/pkgconfig/lqr-1.pc
 @dirrm include/lqr-1/lqr
 @dirrm include/lqr-1
+%%HTMLDOCS%%%%DOCSDIR%%/Introduction.html
+%%HTMLDOCS%%%%DOCSDIR%%/about-this-doc.html
+%%HTMLDOCS%%%%DOCSDIR%%/api-manual.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-deprecated.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-new-0-2.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-new-0-3.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/attach-images.html
+%%HTMLDOCS%%%%DOCSDIR%%/basic.html
+%%HTMLDOCS%%%%DOCSDIR%%/bias.html
+%%HTMLDOCS%%%%DOCSDIR%%/energy.html
+%%HTMLDOCS%%%%DOCSDIR%%/generate-multi-size.html
+%%HTMLDOCS%%%%DOCSDIR%%/index.html
+%%HTMLDOCS%%%%DOCSDIR%%/lqr.html
+%%HTMLDOCS%%%%DOCSDIR%%/overview.html
+%%HTMLDOCS%%%%DOCSDIR%%/progress.html
+%%HTMLDOCS%%%%DOCSDIR%%/read-out.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-bias.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-carve.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-energy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-attach.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-bias-add.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-bias-clear.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-cancel.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-destroy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-flatten.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-channels.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-col-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-energy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-enl-step.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-height.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-image-type.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-orientation.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-ref-height.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-ref-width.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-width.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-init.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-current.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-foreach.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-next.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-start.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-resize.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-rigmask-add.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-rigmask-clear.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan-by-row.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan-line.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan-reset.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-alpha-channel.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-black-channel.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-dump-vmaps.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-energy-function-builtin.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-energy-function.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-enl-step.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-gradient-function.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-image-type.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-preserve-input-image.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-progress.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-resize-order.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-side-switch-frequency.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-use-cache.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-col-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-image-type.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-end-height-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-end-width-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-end.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-init-height-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-init-width-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-init.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-update-step.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-update.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-ret-val.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-get-channels.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-get-radius.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-get-read-t.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-read.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-destroy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-dump.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-data.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-height.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-orientation.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-width.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-internal-dump.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-current.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-foreach.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-next.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-start.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-load.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-pages.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-progress.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-rigmask.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-vmaps.html
+%%HTMLDOCS%%%%DOCSDIR%%/references.html
+%%HTMLDOCS%%%%DOCSDIR%%/release.html
+%%HTMLDOCS%%%%DOCSDIR%%/rigmask.html
+%%HTMLDOCS%%%%DOCSDIR%%/seam-carve.html
+%%HTMLDOCS%%%%DOCSDIR%%/tuning.html
+%%HTMLDOCS%%%%DOCSDIR%%/vmaps.html
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%



More information about the Midnightbsd-cvs mailing list