pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/netpbm Add jpeg dependency and enable it.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/07bb5062c443
branches:  trunk
changeset: 639609:07bb5062c443
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 19 08:42:47 2014 +0000

description:
Add jpeg dependency and enable it.
Adds jpegto* and *tojpeg again, needed e.g. by avr-libc (reported by joerg).
Bump PKGREVISION.

diffstat:

 graphics/netpbm/Makefile |  7 +++++--
 graphics/netpbm/PLIST    |  5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r 4d07ea217cb4 -r 07bb5062c443 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Fri Sep 19 08:35:55 2014 +0000
+++ b/graphics/netpbm/Makefile  Fri Sep 19 08:42:47 2014 +0000
@@ -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_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 @@
 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 @@
 .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 -r 4d07ea217cb4 -r 07bb5062c443 graphics/netpbm/PLIST
--- a/graphics/netpbm/PLIST     Fri Sep 19 08:35:55 2014 +0000
+++ b/graphics/netpbm/PLIST     Fri Sep 19 08:42:47 2014 +0000
@@ -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/infotopam
 bin/jbigtopnm
 bin/jpeg2ktopam
+bin/jpegtopnm
 bin/leaftoppm
 bin/lispmtopgm
 bin/macptopbm
@@ -239,6 +240,7 @@
 bin/pnmtofiasco
 bin/pnmtofits
 bin/pnmtojbig
+bin/pnmtojpeg
 bin/pnmtopalm
 bin/pnmtopclxl
 bin/pnmtoplainpnm
@@ -291,6 +293,7 @@
 bin/ppmtogif
 bin/ppmtoicr
 bin/ppmtoilbm
+bin/ppmtojpeg
 bin/ppmtoleaf
 bin/ppmtolj
 bin/ppmtomap



Home | Main Index | Thread Index | Old Index