summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
committerjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
commit63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /graphics
parent70004632b203c88d357d29ec8f217d1caa85f9c7 (diff)
downloadpkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/SDL-image/Makefile4
-rw-r--r--graphics/autotrace/Makefile6
-rw-r--r--graphics/avifile-devel/Makefile5
-rw-r--r--graphics/clanlib/Makefile3
-rw-r--r--graphics/clanlib/distinfo4
-rw-r--r--graphics/clanlib/patches/patch-aa19
-rw-r--r--graphics/fnlib/Makefile16
-rw-r--r--graphics/gd/Makefile5
-rw-r--r--graphics/gdk-pixbuf/Makefile3
-rw-r--r--graphics/geomview/Makefile6
-rw-r--r--graphics/gfract/Makefile3
-rw-r--r--graphics/gifsicle/Makefile4
-rw-r--r--graphics/gimp/Makefile3
-rw-r--r--graphics/gle/Makefile4
-rw-r--r--graphics/glut/Makefile3
-rw-r--r--graphics/gqview/Makefile3
-rw-r--r--graphics/imlib/Makefile6
-rw-r--r--graphics/libwmf/Makefile4
-rw-r--r--graphics/mpeg2codec/Makefile3
-rw-r--r--graphics/mpeg2codec/distinfo4
-rw-r--r--graphics/mpeg2codec/patches/patch-aa6
-rw-r--r--graphics/xpdf/Makefile3
-rw-r--r--graphics/xzgv/Makefile3
24 files changed, 77 insertions, 47 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 27c1d311090..c194b2a44e6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2001/07/02 16:48:31 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2001/08/29 22:41:14 jlam Exp $
DISTNAME= ImageMagick-5.2.8
CATEGORIES= graphics
@@ -20,7 +20,6 @@ REPLACE_BUILDLINK= Magick++/bin/Magick++-config
REPLACE_BUILDLINK+= magick/Magick-config
GNU_CONFIGURE= YES
-USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -47,4 +46,5 @@ post-install:
.include "../../graphics/jpeg/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/tiff/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/SDL-image/Makefile b/graphics/SDL-image/Makefile
index 578f1d38312..48df1ba35c5 100644
--- a/graphics/SDL-image/Makefile
+++ b/graphics/SDL-image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/07 11:32:23 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:15 jlam Exp $
#
DISTNAME= SDL_image-1.2.0
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.libsdl.org/projects/SDL_image/
COMMENT= image file loading library
GNU_CONFIGURE= YES
-USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -20,4 +19,5 @@ USE_BUILDLINK_ONLY= YES
.include "../../graphics/jpeg/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
.include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 1c443ee9ab1..c182ef52955 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/09 18:25:30 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:15 jlam Exp $
#
DISTNAME= autotrace-0.26
@@ -11,8 +11,8 @@ HOMEPAGE= http://homepages.go.com/homepages/m/a/r/martweb/AutoTrace.htm
COMMENT= convert bitmap to vector graphics
USE_BUILDLINK_ONLY= YES
-GNU_CONFIGURE= YES
-USE_X11= YES
+GNU_CONFIGURE= YES
.include "../../graphics/ImageMagick/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index de2b0d739e6..e6c819a09d8 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/08/26 10:32:21 skrll Exp $
+# $NetBSD: Makefile,v 1.19 2001/08/29 22:41:15 jlam Exp $
#
DISTNAME= avifile-0.6.20010814
@@ -28,7 +28,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
-CXXFLAGS+= -L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include -I${X11PREFIX}/include
+CXXFLAGS+= -L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include
CONFIGURE_ARGS+= --with-win32-path=${LOCALBASE}/lib/win32
CONFIGURE_ARGS+= --disable-dpms
@@ -63,4 +63,5 @@ pre-configure:
cd ${WRKSRC} && ${SH} autogen.sh
.include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 530cfc4b1c0..3f922c2184e 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/08/23 15:55:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:15 jlam Exp $
DISTNAME= ClanLib-0.4.4
CATEGORIES= graphics games devel x11
@@ -40,6 +40,7 @@ post-patch:
.include "../../graphics/Mesa/buildlink.mk"
.include "../../devel/pth/buildlink.mk"
.include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
.if ${OPSYS} == "NetBSD"
diff --git a/graphics/clanlib/distinfo b/graphics/clanlib/distinfo
index fbccd989055..8b76dc101ca 100644
--- a/graphics/clanlib/distinfo
+++ b/graphics/clanlib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/08/23 15:55:26 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/29 22:41:15 jlam Exp $
SHA1 (ClanLib-0.4.4.tar.gz) = 326fb3812bd3c26cd8ecf60d8975c662674ae9a8
Size (ClanLib-0.4.4.tar.gz) = 642836 bytes
-SHA1 (patch-aa) = 6aad55020babe8c11c44fee3c6b67157f1cf228c
+SHA1 (patch-aa) = 3c9669716944b0c1617b9020daa51599616aed5e
SHA1 (patch-ab) = 38acc42d60694482b61853fb14e0460a437a1653
SHA1 (patch-ac) = 383a03b0ecca44a6d3397184d6022a0bb91882da
SHA1 (patch-ad) = ea6da825d77090177c2c5c73362fc5caa80181f3
diff --git a/graphics/clanlib/patches/patch-aa b/graphics/clanlib/patches/patch-aa
index 4b6bd869c75..601ddb98ac8 100644
--- a/graphics/clanlib/patches/patch-aa
+++ b/graphics/clanlib/patches/patch-aa
@@ -1,17 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2001/06/30 11:26:32 zuntum Exp $
---- Makefile.conf.in.orig Thu Dec 14 19:27:08 2000
-+++ Makefile.conf.in Thu Dec 14 19:28:06 2000
-@@ -13,11 +13,11 @@
+$NetBSD: patch-aa,v 1.5 2001/08/29 22:41:16 jlam Exp $
+
+--- Makefile.conf.in.orig Sun Apr 9 08:17:58 2000
++++ Makefile.conf.in
+@@ -13,7 +13,7 @@
BIN_PREFIX = @bindir@
TARGET_PREFIX = @libdir@/ClanLib
-INCLUDE_DIRS = -I Sources @x_includes@
-+INCLUDE_DIRS = -I Sources @x_includes@ -I$(BUILDLINK_DIR)/include
++INCLUDE_DIRS = -I Sources @CPPFLAGS@ @x_includes@
COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@
--LINK_CORE = @libs@
-+LINK_CORE = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib @libs@
+@@ -21,7 +21,7 @@
OBJF_NONDYN = @objf_nondyn@
+-LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX)
++LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) @LDFLAGS@
+
+ Libs/Intermediate/%.o : %.cpp
+ @echo "Compiling $<"
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index dab27eb440e..5af82a8cfde 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/03 16:30:19 zuntum Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:16 jlam Exp $
DISTNAME= fnlib-0.5
CATEGORIES= x11 graphics
@@ -14,9 +14,23 @@ GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
+# defeats buildlink.
+#
+post-patch:
+ cd ${WRKSRC}; \
+ files=`${FIND} . -name "Makefile.in" -print`; \
+ for file in $${files}; do \
+ ${MV} -f $${file} $${file}.fixme; \
+ ${SED} -e "/^INCLUDES.*=.*/s|[ ]*-I\$$(includedir)||" \
+ $${file}.fixme > $${file}; \
+ ${RM} $${file}.fixme; \
+ done
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fnlib
${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib
.include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index f783f3b4138..c9f3d5ced7f 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/06/28 20:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/08/29 22:41:16 jlam Exp $
# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
#
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.boutell.com/gd/
COMMENT= graphics library for fast PNG creation
USE_BUILDLINK_ONLY= YES
-USE_X11= YES
USE_LIBTOOL= YES
REPLACE_PERL= bdftogd
@@ -23,7 +22,6 @@ MAKE_ENV+= EXTRA_LIBS="-lsocket -lnsl"
CPPFLAGS+= -I${BUILDLINK_DIR}/include/freetype # freetype.h
CPPFLAGS+= -I${BUILDLINK_DIR}/include/X11 # xpm.h
-CPPFLAGS+= -I${X11BASE}/include
# When the API changes and breaks binary-compatibility with the previous
# version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise,
@@ -38,4 +36,5 @@ MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
.include "../../graphics/jpeg/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 0934eeed97a..08874ca182f 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/06/26 16:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:17 jlam Exp $
#
PKGNAME= ${DISTNAME}
@@ -24,4 +24,5 @@ post-install:
${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
${RM} ${PREFIX}/lib/gnomecanvaspixbufConf.sh
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 1fb5b3cb7cc..61f2cbb01c2 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/04 03:08:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:17 jlam Exp $
DISTNAME= geomview-1.8.1
CATEGORIES= graphics math
@@ -12,12 +12,11 @@ CONFLICTS= ImageMagick-* # both have a program named 'animate'
USE_BUILDLINK_ONLY= yes
GNU_CONFIGURE= yes
-USE_X11= yes
CONFIGURE_ARGS+= --without-xforms
CONFIGURE_ARGS+= --with-opengl=${BUILDLINK_DIR}
CONFIGURE_ARGS+= --with-motif=${BUILDLINK_DIR}
-CPPFLAGS+= -Dunix -Dalloca=__builtin_alloca -I${X11BASE}/include
+CPPFLAGS+= -Dunix -Dalloca=__builtin_alloca
INFO_FILES= geomview
@@ -43,4 +42,5 @@ post-install:
.include "../../graphics/Mesa/buildlink.mk"
.include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index c378a4288a0..2ef845339d3 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/23 19:45:42 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:17 jlam Exp $
#
DISTNAME= gfract-0.21
@@ -37,4 +37,5 @@ do-install:
.include "../../graphics/png/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 4d17013c5cf..6e479f3709c 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/23 14:03:11 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:17 jlam Exp $
#
DISTNAME= gifsicle-1.29
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.lcdf.org/~eddietwo/gifsicle/
COMMENT= create, edit, and inspect GIFs from shell
GNU_CONFIGURE= YES
-USE_X11= YES
USE_BUILDLINK_ONLY= YES
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index ebce341908b..58d85dcb1b1 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2001/08/02 13:33:09 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2001/08/29 22:41:17 jlam Exp $
DISTNAME= gimp-1.2.2
CATEGORIES= graphics
@@ -69,4 +69,5 @@ post-install:
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../graphics/mpeg-lib/buildlink.mk"
.include "../../x11/gnome-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 16d35d50ce6..92c9e79c81b 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/18 21:32:24 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:18 jlam Exp $
#
DISTNAME= gle-3.0.3
@@ -11,7 +11,6 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.linas.org/gle/
COMMENT= GL subroutines for drawing tubing and extrusions
-#USE_MESA= YES
USE_X11BASE= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -20,4 +19,5 @@ USE_BUILDLINK_ONLY= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index dbe73995ceb..89d4ddef413 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/14 03:07:34 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:18 jlam Exp $
#
.include "../Mesa/Makefile.common"
@@ -37,4 +37,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${PREFIX}/include/GL
.endfor
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index be8b2771467..57c8434551b 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/06/29 04:54:55 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/08/29 22:41:18 jlam Exp $
#
DISTNAME= gqview-0.10.1
@@ -22,4 +22,5 @@ BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../graphics/gdk-pixbuf/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 82629f703de..efe43e321e7 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2001/08/27 14:35:09 tron Exp $
+# $NetBSD: Makefile,v 1.57 2001/08/29 22:41:18 jlam Exp $
#
DISTNAME= imlib-1.9.11
@@ -20,6 +20,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE}
USE_GMAKE= yes
USE_BUILDLINK_ONLY= yes
+REPLACE_BUILDLINK= imlib-config
CPPFLAGS+= -DENABLE_NLS
CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -28,7 +29,7 @@ CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}"
# The following ensures that `imlib-config --libs' includes the correct
# linker flags for linking the X11 libs.
#
-X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
+X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib
pre-configure:
${TOUCH} ${WRKSRC}/ltconfig
@@ -49,4 +50,5 @@ post-install:
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/tiff/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 5a84a0d0ace..a5a35eee4cb 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/07/09 18:51:38 zuntum Exp $
+# $NetBSD: Makefile,v 1.24 2001/08/29 22:41:19 jlam Exp $
#
DISTNAME= libwmf-0.1.21
@@ -10,7 +10,6 @@ HOMEPAGE= http://www.wvware.com/libwmf.html
COMMENT= library for reading and converting WMF (Windows Meta Files)
USE_BUILDLINK_ONLY= YES
-USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --includedir="${PREFIX}/include/libwmf"
@@ -36,4 +35,5 @@ post-install:
.include "../../graphics/freetype-lib/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 86baa83bf7b..06611a60877 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/20 21:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:19 jlam Exp $
DISTNAME= mpeg2vidcodec_v12
PKGNAME= mpeg2codec-1.2
@@ -24,4 +24,5 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/mpeg2codec
${INSTALL_DATA} ${WRKSRC}/par/* ${PREFIX}/share/mpeg2codec
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg2codec/distinfo b/graphics/mpeg2codec/distinfo
index 2e37eef4e26..66335c07b7a 100644
--- a/graphics/mpeg2codec/distinfo
+++ b/graphics/mpeg2codec/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:19 jlam Exp $
SHA1 (mpeg2vidcodec_v12.tar.gz) = 2ba56c46f3a70213e4f09417ad5340ef2b1e312e
Size (mpeg2vidcodec_v12.tar.gz) = 259790 bytes
-SHA1 (patch-aa) = 208e1aa22e94438a281fdca3ec711d93654b6e27
+SHA1 (patch-aa) = 9cf82666ec01966a63832f9105c083722ac3b41d
diff --git a/graphics/mpeg2codec/patches/patch-aa b/graphics/mpeg2codec/patches/patch-aa
index f2d48d398b1..02faf8ff6fb 100644
--- a/graphics/mpeg2codec/patches/patch-aa
+++ b/graphics/mpeg2codec/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/03/30 07:44:35 zuntum Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:19 jlam Exp $
--- Makefile.orig Sat Jul 20 01:35:46 1996
+++ Makefile
@@ -33,8 +33,8 @@ $NetBSD: patch-aa,v 1.5 2001/03/30 07:44:35 zuntum Exp $
-#INCLUDEDIR = -I/usr/openwin/include
-#LIBRARYDIR = -L/usr/openwin/lib
-+INCLUDEDIR = -I${X11BASE}/include
-+LIBRARYDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++INCLUDEDIR = -I${BUILDLINK_X11_DIR}/include
++LIBRARYDIR = -L${BUILDLINK_X11_DIR}/lib -Wl,-R${X11BASE}/lib
# select one of the following CC CFLAGS settings
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 3feeedd2177..3be191b6843 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/06/29 19:53:21 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/08/29 22:41:19 jlam Exp $
# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
#
@@ -41,4 +41,5 @@ post-install:
.include "../../graphics/freetype-lib/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
.include "../../textproc/t1lib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 684719c9807..f76ff7c5726 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/23 15:56:41 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:19 jlam Exp $
DISTNAME= xzgv-0.7
CATEGORIES= graphics
@@ -23,4 +23,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done
.include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 21:10:21 +0000