Date: Thu, 31 Oct 2013 13:07:20 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332238 - head/graphics/pstoedit Message-ID: <201310311307.r9VD7KuW091662@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Thu Oct 31 13:07:20 2013 New Revision: 332238 URL: http://svnweb.freebsd.org/changeset/ports/332238 Log: - Change maintainer email to @FreeBSD.org - Use the new format for LIB_DEPENDS - Support STAGEDIR and add OPTIONS_SUB - Add DOCS and EXAMPLES Options - Add MING to default Options - Add patch, fix build on FreeBSD 10 Approved by: pawel / wg (mentors, implicit) Modified: head/graphics/pstoedit/Makefile head/graphics/pstoedit/pkg-plist Modified: head/graphics/pstoedit/Makefile ============================================================================== --- head/graphics/pstoedit/Makefile Thu Oct 31 13:00:38 2013 (r332237) +++ head/graphics/pstoedit/Makefile Thu Oct 31 13:07:20 2013 (r332238) @@ -7,15 +7,18 @@ PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= Convert PostScript to other vector graphic formats LICENSE= GPLv2 -LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd +LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd + +OPTIONS_DEFINE= DOCS EMF EXAMPLES MAGICK MING PLOTUTILS +OPTIONS_DEFAULT= EMF MAGICK MING PLOTUTILS + +OPTIONS_SUB= yes -OPTIONS_DEFINE= MAGICK EMF MING PLOTUTILS -OPTIONS_DEFAULT= MAGICK EMF PLOTUTILS EMF_DESC= Enable emf interface MING_DESC= Enable swf interface PLOTUTILS_DESC= Enable libplot interface @@ -28,65 +31,42 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include/ming -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= pstoedit.1 - PORTDOCS= * PORTEXAMPLES= * -NO_STAGE= yes -.include <bsd.port.options.mk> +EMF_LIB_DEPENDS= libEMF.so:${PORTSDIR}/graphics/libemf +EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF +EMF__CONFIGURE_OFF= --without-emf + +MAGICK_LIB_DEPENDS= libMagick++.so:${PORTSDIR}/graphics/ImageMagick +MAGICK_CONFIGURE_ON= --with-magick +MAGICK_CONFIGURE_OFF= --without-magick + +MING_LIB_DEPENDS= libming.so:${PORTSDIR}/graphics/ming +MING_CONFIGURE_ON= --with-swf +MING_CONFIGURE_OFF= --without-swf + +PLOTUTILS_LIB_DEPENDS= libplotter.so:${PORTSDIR}/graphics/plotutils +PLOTUTILS_CONFIGURE_ON= --with-libplot +PLOTUTILS_CONFIGURE_OFF= --without-libplot -.if ${PORT_OPTIONS:MMAGICK} -LIB_DEPENDS+= Magick++:${PORTSDIR}/graphics/ImageMagick -PLIST_SUB+= IMAGEMAGICK="" -.else -CONFIGURE_ARGS+= --without-magick -PLIST_SUB+= IMAGEMAGICK="@comment " -.endif - -.if ${PORT_OPTIONS:MEMF} -LIB_DEPENDS+= EMF:${PORTSDIR}/graphics/libemf -CONFIGURE_ARGS+= --with-libemf-include=${LOCALBASE}/include/libEMF -PLIST_SUB+= EMF="" -.else -CONFIGURE_ARGS+= --without-emf -PLIST_SUB+= EMF="@comment " -.endif - -.if ${PORT_OPTIONS:MMING} -LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming -PLIST_SUB+= MING="" -.else -CONFIGURE_ARGS+= --without-swf -PLIST_SUB+= MING="@comment " -.endif - -.if ${PORT_OPTIONS:MPLOTUTILS} -LIB_DEPENDS+= plotter:${PORTSDIR}/graphics/plotutils -PLIST_SUB+= PLOTUTILS="" -.else -CONFIGURE_ARGS+= --without-libplot -PLIST_SUB+= PLOTUTILS="@comment " -.endif +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|CXXFLAGS="-g"|CXXFLAGS="$$CXXFLAGS"|g ; \ s|GraphicsMagick|Magick|g ; \ s|=$$OLDCPPFLAGS|=$$CPPFLAGS|g ; \ + s|-lstdc++||g ; \ s|-pedantic||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/src/Makefile.in post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR} -.endif - -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${EXAMPLESDIR} -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/graphics/pstoedit/pkg-plist ============================================================================== --- head/graphics/pstoedit/pkg-plist Thu Oct 31 13:00:38 2013 (r332237) +++ head/graphics/pstoedit/pkg-plist Thu Oct 31 13:07:20 2013 (r332238) @@ -21,10 +21,10 @@ lib/libpstoedit.so.0 %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.la %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so.0 -%%IMAGEMAGICK%%lib/pstoedit/libp2edrvmagick++.a -%%IMAGEMAGICK%%lib/pstoedit/libp2edrvmagick++.la -%%IMAGEMAGICK%%lib/pstoedit/libp2edrvmagick++.so -%%IMAGEMAGICK%%lib/pstoedit/libp2edrvmagick++.so.0 +%%MAGICK%%lib/pstoedit/libp2edrvmagick++.a +%%MAGICK%%lib/pstoedit/libp2edrvmagick++.la +%%MAGICK%%lib/pstoedit/libp2edrvmagick++.so +%%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0 lib/pstoedit/libp2edrvstd.a lib/pstoedit/libp2edrvstd.la lib/pstoedit/libp2edrvstd.so @@ -38,6 +38,7 @@ lib/pstoedit/libp2edrvstd.so.0 %%EMF%%lib/pstoedit/libp2edrvwmf.so %%EMF%%lib/pstoedit/libp2edrvwmf.so.0 libdata/pkgconfig/pstoedit.pc +man/man1/pstoedit.1.gz share/aclocal/pstoedit.m4 %%DATADIR%%/drvhpgl.pencolors %%DATADIR%%/examplefigmap.fmp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311307.r9VD7KuW091662>