[pkgsrc/trunk]: pkgsrc/x11/openmotif Enable jpeg and png support. From Marc B...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e128145412a
branches:  trunk
changeset: 568236:6e128145412a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Dec 08 20:25:30 2009 +0000

description:
Enable jpeg and png support. From Marc Balmer.

diffstat:

 x11/openmotif/Makefile      |  16 ++++++++++++----
 x11/openmotif/buildlink3.mk |   6 ++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 82515231b1fd -r 6e128145412a x11/openmotif/Makefile
--- a/x11/openmotif/Makefile    Tue Dec 08 18:54:50 2009 +0000
+++ b/x11/openmotif/Makefile    Tue Dec 08 20:25:30 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2009/10/19 21:47:22 tez Exp $
+# $NetBSD: Makefile,v 1.62 2009/12/08 20:25:30 joerg Exp $
 
 PKGVER=                2.3.1
 DISTNAME=      openmotif-${PKGVER}
-#PKGREVISION=  3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  http://ftp.ics.com/openmotif/2.3/2.3.1/
 MASTER_SITES+= ftp://ftp.ics.com/openmotif/2.3/2.3.1/
@@ -52,6 +51,13 @@
 SUBST_SED.man_rename+=         -e 's: Object.3: XObject.3:g'
 SUBST_SED.man_rename+=         -e 's: Shell.3: XShell.3:g'
 
+CONFIGURE_ARGS+= \
+               --enable-jpeg --enable-png \
+               --with-libjpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \
+               --with-libjpeg-lib=${BUILDLINK_PREFIX.jpeg}/lib \
+               --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
+               --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib
+
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ENV+=                ac_cv_func_setpgrp_void=no
 .endif
@@ -102,7 +108,8 @@
                ${MV} -f $${manpage}.tblized $${manpage};               \
        done
 
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
@@ -110,4 +117,5 @@
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 82515231b1fd -r 6e128145412a x11/openmotif/buildlink3.mk
--- a/x11/openmotif/buildlink3.mk       Tue Dec 08 18:54:50 2009 +0000
+++ b/x11/openmotif/buildlink3.mk       Tue Dec 08 20:25:30 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/12/08 20:25:30 joerg Exp $
 
 BUILDLINK_TREE+=       openmotif
 
@@ -9,7 +9,8 @@
 BUILDLINK_ABI_DEPENDS.openmotif?=      openmotif>=2.3.1
 BUILDLINK_PKGSRCDIR.openmotif?=        ../../x11/openmotif
 
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
@@ -17,6 +18,7 @@
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .endif # OPENMOTIF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -openmotif