diff options
| author | wiz <wiz@pkgsrc.org> | 2014-09-19 08:42:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-09-19 08:42:47 +0000 |
| commit | ae27ab7071b1387d3e2f20948ced7e10d3dec2d6 (patch) | |
| tree | 9575b1495cfd7f6b828c36f35868f0aca65d7bc7 | |
| parent | c0265e5742054359eda4c0c1c11d1ea06732075f (diff) | |
| download | pkgsrc-ae27ab7071b1387d3e2f20948ced7e10d3dec2d6.tar.gz | |
Add jpeg dependency and enable it.
Adds jpegto* and *tojpeg again, needed e.g. by avr-libc (reported by joerg).
Bump PKGREVISION.
| -rw-r--r-- | graphics/netpbm/Makefile | 7 | ||||
| -rw-r--r-- | graphics/netpbm/PLIST | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 8e8f88bad86..fefa7ffd9fb 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.192 2014/09/10 10:54:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.193 2014/09/19 08:42:47 wiz Exp $ DISTNAME= netpbm-10.67.05 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= # # manually created from svn checkout of @@ -71,7 +72,6 @@ SUBST_FILES.xopen+= lib/pmfileio.c lib/libpam.c lib/colorname.c SUBST_SED.xopen= -e '/define.*_XOPEN_SOURCE/s/600/500/g' .endif - # only used if NEED_RUNTIME_PATH is set, so set it unconditionally MAKE_FLAGS+= NETPBMLIB_RUNTIME_PATH=${PREFIX} @@ -93,6 +93,8 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/netpbm post-extract: cd ${WRKSRC} && ${CP} config.mk.in config.mk ${ECHO} "CFLAGS_SHLIB = -fPIC" >> ${WRKSRC}/config.mk + ${ECHO} "JPEGLIB = ${BUILDLINK_PREFIX.jpeg}/lib/libjpeg.so" >> ${WRKSRC}/config.mk + ${ECHO} "JPEGHDR_DIR = ${BUILDLINK_PREFIX.jpeg}/include" >> ${WRKSRC}/config.mk .if ${OPSYS} == "Darwin" ${ECHO} 'LDSHLIB=-dynamiclib -install_name $$(PREFIX)/lib/libnetpbm.$$(MAJ).dylib -compatibility_version $$(MAJ) -current_version $$(MAJ).$$(MIN)' >> ${WRKSRC}/config.mk .endif @@ -117,4 +119,5 @@ post-install: .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST index 11bff37045a..a215242b441 100644 --- a/graphics/netpbm/PLIST +++ b/graphics/netpbm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2014/09/08 21:51:25 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2014/09/19 08:42:47 wiz Exp $ bin/411toppm bin/anytopnm bin/asciitopgm @@ -32,6 +32,7 @@ bin/imgtoppm bin/infotopam bin/jbigtopnm bin/jpeg2ktopam +bin/jpegtopnm bin/leaftoppm bin/lispmtopgm bin/macptopbm @@ -239,6 +240,7 @@ bin/pnmtoddif bin/pnmtofiasco bin/pnmtofits bin/pnmtojbig +bin/pnmtojpeg bin/pnmtopalm bin/pnmtopclxl bin/pnmtoplainpnm @@ -291,6 +293,7 @@ bin/ppmtoeyuv bin/ppmtogif bin/ppmtoicr bin/ppmtoilbm +bin/ppmtojpeg bin/ppmtoleaf bin/ppmtolj bin/ppmtomap |