diff options
| author | joerg <joerg@pkgsrc.org> | 2009-12-08 20:25:30 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-12-08 20:25:30 +0000 |
| commit | fd5983a423e73b4688c216d5b4e07950d2e5209a (patch) | |
| tree | c019c961c2c656bcc5d73b9b5e3b78d133a51909 /x11 | |
| parent | ab8881119fa4a7d510ef38a56821b838b54d060e (diff) | |
| download | pkgsrc-fd5983a423e73b4688c216d5b4e07950d2e5209a.tar.gz | |
Enable jpeg and png support. From Marc Balmer.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/openmotif/Makefile | 16 | ||||
| -rw-r--r-- | x11/openmotif/buildlink3.mk | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index b109e47e6d9..60853e2cd84 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -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: Core.3: XCore.3:g' 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 @@ post-build: ${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 @@ post-build: .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 --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk index 586af7b683a..a631e4a8011 100644 --- a/x11/openmotif/buildlink3.mk +++ b/x11/openmotif/buildlink3.mk @@ -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_API_DEPENDS.openmotif+= openmotif>=2.3.1 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 @@ BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif .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 |