* Add a some more graphics capability to magicpoint by adding a dependency on

  graphics/mng.
* Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
* Replace definition of XMKMF with one that takes xpkgwedge/buildlink into
  account.  Fixes pkg/13588 by Luke Mewburn <lukem@wasabisystems.com>.

3 files changed, 72 insertions, 9 deletions

diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 6652c6d937b..f78875c8fe0 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/06/12 20:33:03 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/07/31 05:27:30 jlam Exp $
 
 DISTNAME=		magicpoint-1.08a
 CATEGORIES=		x11 graphics
@@ -8,21 +8,20 @@ MAINTAINER=		itojun@itojun.org
 HOMEPAGE=		http://www.Mew.org/mgp/
 COMMENT=		X11 based presentation tool
 
-DEPENDS+=		freetype-lib>=1.3.1:../../graphics/freetype-lib
-DEPENDS+=		png>=1.0.11:../../graphics/png
-
 CONFLICTS=		mgp-*
 
+USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
 USE_IMAKE=		yes
-CONFIGURE_ARGS=		--disable-vflib --enable-freetype-charset16 \
-			--enable-locale
-LIBS=			-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lintl		# needed so -lttf works
+CONFIGURE_ARGS+=	--enable-freetype-charset16
+CONFIGURE_ARGS+=	--disable-vflib
+CONFIGURE_ARGS+=	--enable-locale
+CONFIGURE_ARGS+=	--enable-gif
 
 # We need to perform the steps normally done by ``xmkmf -a'' since some
 # files need to be created before ``make depend''.
 #
-XMKMF=			${X11BASE}/bin/xmkmf
+XMKMF=			${XMKMF_CMD} ${XMKMF_FLAGS}
 
 post-configure:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ctlwords.h
@@ -44,4 +43,9 @@ post-install:
 	${INSTALL_DATA} README* *.jpg *.eps *.mgp *.xbm mgprc-sample \
 		${PREFIX}/share/examples/mgp
 
+.include "../../graphics/freetype-lib/buildlink.mk"
+.include "../../graphics/libungif/buildlink.mk"
+.include "../../graphics/mng/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../japanese/vflib-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo
index c5983a330d9..4e3c11cc29c 100644
--- a/graphics/magicpoint/distinfo
+++ b/graphics/magicpoint/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/24 10:36:00 itojun Exp $
+$NetBSD: distinfo,v 1.4 2001/07/31 05:27:30 jlam Exp $
 
 SHA1 (magicpoint-1.08a.tar.gz) = 4b336fff82e0d2c7d4d36b7a914f5d374b6a9343
 Size (magicpoint-1.08a.tar.gz) = 815048 bytes
+SHA1 (patch-aa) = 739e9597b407f6e08ac25fd190bce05d37c116ff
diff --git a/graphics/magicpoint/patches/patch-aa b/graphics/magicpoint/patches/patch-aa
new file mode 100644
index 00000000000..51dd821355b
--- /dev/null
+++ b/graphics/magicpoint/patches/patch-aa
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.7 2001/07/31 05:27:31 jlam Exp $
+
+--- configure.orig	Tue May 22 02:09:41 2001
++++ configure
+@@ -1763,7 +1763,7 @@
+ if test "$mgp_use_freetype" = "yes"; then
+  	echo $ac_n "checking for freetype library/header""... $ac_c" 1>&6
+ echo "configure:1766: checking for freetype library/header" >&5
+- 	for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr; do
++ 	for dir in ${BUILDLINK_DIR}; do
+  		ac_cv_ft_lib=no
+  		ac_cv_ft_include=no
+ 		shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'`
+@@ -1958,7 +1958,7 @@
+ if test "$mgp_use_vflib" = "yes"; then
+ 	echo $ac_n "checking for VFlib library/header""... $ac_c" 1>&6
+ echo "configure:1961: checking for VFlib library/header" >&5
+-	for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr; do
++	for dir in ${BUILDLINK_DIR}; do
+ 		ac_cv_vf_libname=VFlib
+ 		ac_cv_vf_libdir=no
+ 		ac_cv_vf_hdrdir=no
+@@ -2128,7 +2128,7 @@
+ 	fi
+ fi
+ 
+-for i in /usr/pkg /usr/local /usr; do
++for i in ${BUILDLINK_DIR}; do
+ 	if test -f $i/include/png.h; then 
+ 		if test -f $i/lib/libpng.a ; then
+ 			DEPLIBS="$DEPLIBS $i/lib/libpng.a"
+@@ -2231,7 +2231,7 @@
+ 	fi
+ done
+ 
+-for i in /usr/pkg /usr/local /usr; do
++for i in ${BUILDLINK_DIR}; do
+ 	if test -f $i/include/libmng.h; then 
+ 		if test -f $i/lib/libmng.a ; then
+ 			DEPLIBS="$DEPLIBS $i/lib/libmng.a"
+@@ -2764,7 +2764,7 @@
+ 		echo 'FATAL: You need libungif to use gif images.  pass proper LIBS to configure.'
+ 		exit 1
+ 	fi
+-	for i in /usr/pkg /usr/local /usr; do
++	for i in ${BUILDLINK_DIR}; do
+ 		if test -f $i/include/gif_lib.h; then
+ 			gif_h_ok=yes
+ 			OPTFLAGS="$OPTFLAGS -I$i/include"
+@@ -2844,7 +2844,7 @@
+ 		echo 'FATAL: You need libImlib to use Imlib loading.  pass proper LIBS to configure.'
+ 		exit 1
+ 	fi
+-	for i in /usr/pkg /usr/local; do
++	for i in ${BUILDLINK_DIR}; do
+ 		if test -f $i/include/Imlib.h; then
+ 			imlib_h_ok=yes
+ 			OPTFLAGS="$OPTFLAGS -I$i/include"