diff options
author | jhale <jhale@FreeBSD.org> | 2014-06-25 03:47:31 +0000 |
---|---|---|
committer | jhale <jhale@FreeBSD.org> | 2014-06-25 03:47:31 +0000 |
commit | 0450060fb4821f655d79751f6f49f5d34c02fb1f (patch) | |
tree | 0a9bbd450009a55a372c09bd05f294c3aae2a814 | |
parent | 9f5026d0cf6321de4eee5dadfde08ccac8240330 (diff) | |
download | FreeBSD-ports-0450060fb4821f655d79751f6f49f5d34c02fb1f.zip FreeBSD-ports-0450060fb4821f655d79751f6f49f5d34c02fb1f.tar.gz |
- Support staging
- Use new LIB_DEPENDS syntax
- Use options helpers
- Add missing DOCS option to options list
- Bump PORTREVISION
Approved by: portmgr (blanket approval)
-rw-r--r-- | graphics/djvulibre/Makefile | 38 | ||||
-rw-r--r-- | graphics/djvulibre/pkg-plist | 21 |
2 files changed, 32 insertions, 27 deletions
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index e30f0c9..d91f31f 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -3,7 +3,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.25.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics www MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION:R} @@ -12,8 +12,8 @@ COMMENT= DjVu base libraries and utilities LICENSE= GPLv2 -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - tiff:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libtiff.so:${PORTSDIR}/graphics/tiff USES= pathfix iconv GNU_CONFIGURE= yes @@ -29,30 +29,18 @@ USE_LDCONFIG= yes CONFLICTS= djvulibre-nox11-3* WRKSRC = ${WRKDIR}/${DISTNAME:R} -OPTIONS_DEFINE = ANY2DJVU -ANY2DJVU_DESC= Install any2djvu script (requires curl) +PORTDOCS= djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu -MAN1= bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \ - djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \ - djvused.1 djvuserve.1 djvutxt.1 -MAN1_EN= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 +OPTIONS_DEFINE= DOCS ANY2DJVU +OPTIONS_SUB= yes -NO_STAGE= yes -.include <bsd.port.options.mk> +ANY2DJVU_DESC= Install any2djvu script (requires curl) +ANY2DJVU_RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl -.if ${PORT_OPTIONS:MANY2DJVU} -MAN1_EN+= any2djvu.1 -RUN_DEPENDS+= curl:${PORTSDIR}/ftp/curl -PLIST_SUB+= ANY2DJVU="" -.else -PLIST_SUB+= ANY2DJVU="@comment " -.endif +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e \ - 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/libdjvu/Makefile.in - @${REINPLACE_CMD} -e \ '/-[Og]\*)/d ; \ s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \ s|$$OPTS $$opt|$$OPTS|g' \ @@ -68,12 +56,8 @@ post-patch: @${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in .endif -.if ${PORT_OPTIONS:MDOC} -PORTDOCS= djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu - post-install: - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/ -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index 4ae162f6..981d1ac 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -22,6 +22,27 @@ include/libdjvu/miniexp.h lib/libdjvulibre.so lib/libdjvulibre.so.25 libdata/pkgconfig/ddjvuapi.pc +%%ANY2DJVU%%man/man1/any2djvu.1.gz +man/man1/bzz.1.gz +man/man1/c44.1.gz +man/man1/cjb2.1.gz +man/man1/cpaldjvu.1.gz +man/man1/csepdjvu.1.gz +man/man1/ddjvu.1.gz +man/man1/djvm.1.gz +man/man1/djvmcvt.1.gz +man/man1/djvu.1.gz +man/man1/djvudigital.1.gz +man/man1/djvudump.1.gz +man/man1/djvuextract.1.gz +man/man1/djvumake.1.gz +man/man1/djvups.1.gz +man/man1/djvused.1.gz +man/man1/djvuserve.1.gz +man/man1/djvutoxml.1.gz +man/man1/djvutxt.1.gz +man/man1/djvuxml.1.gz +man/man1/djvuxmlparser.1.gz share/djvu/osi/cs/messages.xml share/djvu/osi/de/libdjvu++.xml share/djvu/osi/de/messages.xml |