4 files changed, 41 insertions, 45 deletions
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index f37bf351963..7d737d67a48 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2003/03/02 19:47:23 jschauma Exp $
+# $NetBSD: Makefile,v 1.35 2003/09/11 16:09:40 jmmv Exp $
 
-DISTNAME=		magicpoint-1.09a
-PKGREVISION=		2
+DISTNAME=		magicpoint-1.10a
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://ftp.mew.org/pub/MagicPoint/
 
@@ -14,6 +13,8 @@ CONFLICTS=		mgp-[0-9]*
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_IMAKE=		yes
+USE_PERL5=		build
+
 CONFIGURE_ARGS+=	--enable-freetype-charset16
 CONFIGURE_ARGS+=	--disable-vflib
 CONFIGURE_ARGS+=	--enable-locale
@@ -44,7 +45,9 @@ post-install:
 	${INSTALL_DATA} README* *.jpg *.eps *.mgp *.xbm mgprc-sample \
 		${PREFIX}/share/examples/mgp
 
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
+.include "../../fonts/fontconfig/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
 .include "../../graphics/netpbm/buildlink2.mk"
diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo
index 48f8a857068..34624160b50 100644
--- a/graphics/magicpoint/distinfo
+++ b/graphics/magicpoint/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2001/09/30 05:11:57 itojun Exp $
+$NetBSD: distinfo,v 1.8 2003/09/11 16:09:40 jmmv Exp $
 
-SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f
-Size (magicpoint-1.09a.tar.gz) = 816234 bytes
-SHA1 (patch-aa) = 8576e5caaa9a32c769cddab1779b43b8432e658a
-SHA1 (patch-ac) = ec4a83e3d9a7f39a4a632a87d45b0cbcf761e526
+SHA1 (magicpoint-1.10a.tar.gz) = 7510ee965316cb52eac7a430f0e19a87a337fe5c
+Size (magicpoint-1.10a.tar.gz) = 843657 bytes
+SHA1 (patch-aa) = 06415f6277a10320aa5bc7df6dd1e8af9858fd54
+SHA1 (patch-ac) = 1b2de41c2a8da28c9023552eff676c40069630fe
diff --git a/graphics/magicpoint/patches/patch-aa b/graphics/magicpoint/patches/patch-aa
index 5417cbef12f..419b147a5a5 100644
--- a/graphics/magicpoint/patches/patch-aa
+++ b/graphics/magicpoint/patches/patch-aa
@@ -1,53 +1,44 @@
-$NetBSD: patch-aa,v 1.8 2001/09/14 05:41:06 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2003/09/11 16:09:40 jmmv Exp $
 
---- configure.orig	Tue May 22 02:09:41 2001
-+++ configure	Fri Sep 14 01:34:23 2001
-@@ -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
+--- configure.orig	2003-05-28 07:34:23.000000000 +0200
++++ configure
+@@ -4108,7 +4108,7 @@ if test "$mgp_use_freetype" = "yes"; the
+   # XXX: freetype2 may use freetype-config
+  	echo "$as_me:$LINENO: checking for freetype1 library/header" >&5
+ echo $ECHO_N "checking for freetype1 library/header... $ECHO_C" >&6
+- 	for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 ; 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 @@
+@@ -4643,7 +4643,7 @@ echo "${ECHO_T}$mgp_use_vflib" >&6
  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
+ 	echo "$as_me:$LINENO: checking for VFlib library/header" >&5
+ echo $ECHO_N "checking for VFlib library/header... $ECHO_C" >&6
 -	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
+@@ -4867,7 +4867,7 @@ _ACEOF
  
--for i in /usr/pkg /usr/local /usr; do
-+for i in ${BUILDLINK_DIR}; do
- 	if test -f $i/include/png.h; then 
+   fi
+ else
+-  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
+@@ -5010,7 +5010,7 @@ fi
+   done
+ fi
  
 -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/include/libmng.h; then
  		if test -f $i/lib/libmng.a ; then
  			DEPLIBS="$DEPLIBS $i/lib/libmng.a"
-@@ -2277,7 +2277,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
-+  LIBS="$LIBS -lmng"
- 			 cat >> confdefs.h <<\EOF
- #define MNG 1
- EOF
-@@ -2764,7 +2764,7 @@
+@@ -5647,7 +5647,7 @@ fi
  		echo 'FATAL: You need libungif to use gif images.  pass proper LIBS to configure.'
  		exit 1
  	fi
@@ -56,7 +47,7 @@ $NetBSD: patch-aa,v 1.8 2001/09/14 05:41:06 jlam Exp $
  		if test -f $i/include/gif_lib.h; then
  			gif_h_ok=yes
  			OPTFLAGS="$OPTFLAGS -I$i/include"
-@@ -2844,7 +2844,7 @@
+@@ -5757,7 +5757,7 @@ fi
  		echo 'FATAL: You need libImlib to use Imlib loading.  pass proper LIBS to configure.'
  		exit 1
  	fi
diff --git a/graphics/magicpoint/patches/patch-ac b/graphics/magicpoint/patches/patch-ac
index 2a2421f8a8d..b6cc6cb231e 100644
--- a/graphics/magicpoint/patches/patch-ac
+++ b/graphics/magicpoint/patches/patch-ac
@@ -1,10 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2001/09/14 05:41:06 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2003/09/11 16:09:41 jmmv Exp $
 
---- Imakefile.in.orig	Sat Feb  3 13:46:49 2001
-+++ Imakefile.in	Fri Sep 14 01:35:12 2001
-@@ -23,7 +23,7 @@
+--- Imakefile.in.orig	2001-02-03 19:46:49.000000000 +0100
++++ Imakefile.in
+@@ -22,8 +22,9 @@ LEX=	@LEX@
+ OPTFLAGS=	@OPTFLAGS@
  DEFS=	@DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\"
  #DEFS+=	-DGLYPHEDGE
++DEPENDFLAGS=	$(DEFS) $(OPTFLAGS)
  
 -SYS_LIBRARIES=	-L$(srcdir)/image -lmgpimage @LIBS@
 +SYS_LIBRARIES=	-L$(srcdir)/image -lmgpimage @LDFLAGS@ @LIBS@