Upgrade to version 3.7.1. This is not done because of any problems,

just to get a more modern base for feeding back change, as requested
by Hubert Feyrer.  New distribution through SourceForge.

As a bonus, mptool is now enabled (uses Gtk, not any Sun stuff).

4 files changed, 45 insertions, 47 deletions

diff --git a/print/mp/Makefile b/print/mp/Makefile
index bc8702710a3..49e7451ebe1 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,31 +1,27 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:51:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/21 21:33:09 kim Exp $
 #
 
-DISTNAME=	mpdist-3.5.2
-PKGNAME=	mp-3.5.2
+DISTNAME=	mpdist-3.7.1
+PKGNAME=	mp-3.7.1
 CATEGORIES=	print
-MASTER_SITES=	http://java.sun.com/people/richb/RichApps/mp/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpdist/}
 
 MAINTAINER=     kim@tac.nyc.ny.us
-HOMEPAGE=	http://java.sun.com/people/richb/
+HOMEPAGE=	http://mpdist.sourceforge.net/
 COMMENT=	PostScript pretty printer
 
-GNU_CONFIGURE=	yes
-
-USE_X11=	yes
+GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_X11=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=--disable-mptool
-CONFIGURE_ARGS+=--with-prologue=${PREFIX}/share/mp
-
 .if ${OPSYS} == "SunOS"
 .else
 CONFIGURE_ARGS+=--enable-bsd-print
 .endif
 
-post-install:
-	${MV} ${PREFIX}/share/mpdist ${PREFIX}/share/mp
-	${RM} -f ${PREFIX}/man/man1/mptool.1
-
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/mp/PLIST b/print/mp/PLIST
index de5127379dc..108865cc819 100644
--- a/print/mp/PLIST
+++ b/print/mp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:51 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/21 21:33:09 kim Exp $
 bin/cutlines
 bin/digestp
 bin/ertf2latex
@@ -12,6 +12,7 @@ bin/mimep
 bin/mimepps
 bin/mimepurl
 bin/mp
+bin/mptool
 bin/newsp
 bin/proplanp
 bin/text2latex
@@ -22,19 +23,20 @@ man/man1/mimep.1
 man/man1/mimep_fr.1
 man/man1/mimep_fr3.1
 man/man1/mp.1
-share/mp/mp.common.ps
-share/mp/mp.pro.alt.ps
-share/mp/mp.pro.altl.ps
-share/mp/mp.pro.ff.ps
-share/mp/mp.pro.ffp.ps
-share/mp/mp.pro.fp.ps
-share/mp/mp.pro.l.c1.ps
-share/mp/mp.pro.l.old
-share/mp/mp.pro.l.ps
-share/mp/mp.pro.old
-share/mp/mp.pro.pp.ps
-share/mp/mp.pro.ps
-share/mp/mp.pro.tm.ps
-share/mp/mp.pro.tsi.ps
-share/mp/mp.pro.tsp.ps
-@dirrm share/mp
+man/man1/mptool.1
+share/mpdist/mp.common.ps
+share/mpdist/mp.pro.alt.ps
+share/mpdist/mp.pro.altl.ps
+share/mpdist/mp.pro.ff.ps
+share/mpdist/mp.pro.ffp.ps
+share/mpdist/mp.pro.fp.ps
+share/mpdist/mp.pro.l.c1.ps
+share/mpdist/mp.pro.l.old
+share/mpdist/mp.pro.l.ps
+share/mpdist/mp.pro.old
+share/mpdist/mp.pro.pp.ps
+share/mpdist/mp.pro.ps
+share/mpdist/mp.pro.tm.ps
+share/mpdist/mp.pro.tsi.ps
+share/mpdist/mp.pro.tsp.ps
+@dirrm share/mpdist
diff --git a/print/mp/distinfo b/print/mp/distinfo
index d492f4f6cfe..6fcf24b46ac 100644
--- a/print/mp/distinfo
+++ b/print/mp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/09/21 21:33:10 kim Exp $
 
-SHA1 (mpdist-3.5.2.tar.gz) = eb8351537db25ac8567ed063428b7d532121a2b4
-Size (mpdist-3.5.2.tar.gz) = 335386 bytes
-SHA1 (patch-aa) = 1ebba95d444215bbed70c99ab3d454b9620aa7db
+SHA1 (mpdist-3.7.1.tar.gz) = fbc133240e4135d157df79ec7a345c927bb3dfa0
+Size (mpdist-3.7.1.tar.gz) = 402291 bytes
+SHA1 (patch-aa) = 9aa51c8ac443122b972087a7b74390abbc9d5253
diff --git a/print/mp/patches/patch-aa b/print/mp/patches/patch-aa
index 5be885ad64d..f128a5a7159 100644
--- a/print/mp/patches/patch-aa
+++ b/print/mp/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2000/09/24 14:37:28 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2003/09/21 21:33:11 kim Exp $
 
---- configure.orig	Sun Sep 24 16:30:11 2000
-+++ configure
-@@ -2247,7 +2247,7 @@
+--- mimep/mimep/Makefile.in.orig	Tue Oct 15 14:59:05 2002
++++ mimep/mimep/Makefile.in	Sun Sep 21 17:25:22 2003
+@@ -112,7 +112,7 @@
+ 	$(X_CFLAGS)
  
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
+ 
+-LDFLAGS = \
++AM_LDFLAGS = \
+ 	$(top_builddir)/mp/header.o \
+ 	$(top_builddir)/mp/input.o \
+ 	$(top_builddir)/mp/print.o