6 files changed, 19 insertions, 122 deletions

diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 75d0692ea60e..19b8ee0f29e9 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	gpaint
-PORTVERSION=	0.2.2
-PORTREVISION=	3
+PORTVERSION=	0.3.1
+DISTVERSIONPREFIX=	2-
 CATEGORIES=	graphics gnome
-MASTER_SITES=	http://www.atai.org/gpaint/
+MASTER_SITES=	ftp://alpha.gnu.org/gnu/gpaint/ CENKES
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small-scale painting program for GNOME
 
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomeprint
+USE_GNOME=	libgnomeprint libgnomeprintui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_FILES=	bin/${PORTNAME}-2
 
 .include <bsd.port.mk>
diff --git a/graphics/gpaint/distinfo b/graphics/gpaint/distinfo
index 7430990c51b4..8f10f7cf3d79 100644
--- a/graphics/gpaint/distinfo
+++ b/graphics/gpaint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpaint-0.2.2.tar.gz) = e4fb131252434cf335ae228ced1563a5
-SHA256 (gpaint-0.2.2.tar.gz) = c469735c07ed8fbcd93348000f5902c84dc52b05c88ae346979fca0fc764652e
-SIZE (gpaint-0.2.2.tar.gz) = 331237
+MD5 (gpaint-2-0.3.1.tar.gz) = c05d5a523e3c82da9c58225ba6219e3c
+SHA256 (gpaint-2-0.3.1.tar.gz) = 461e50214d3f30f100279f3226214d56cf1f35c05c52fa0b51dff43dc600f535
+SIZE (gpaint-2-0.3.1.tar.gz) = 374185
diff --git a/graphics/gpaint/files/patch-src::Makefile.in b/graphics/gpaint/files/patch-src::Makefile.in
deleted file mode 100644
index 8dd12ade9a02..000000000000
--- a/graphics/gpaint/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in	2002/03/17 16:11:28	1.1
-+++ src/Makefile.in	2002/03/17 16:12:09
-@@ -119,6 +119,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir)/intl \
-+	$(GDK_PIXBUF_CFLAGS) \
- 	$(GNOME_INCLUDEDIR)
- 
- 
diff --git a/graphics/gpaint/files/patch-src::util.c b/graphics/gpaint/files/patch-src::util.c
deleted file mode 100644
index b02357b79850..000000000000
--- a/graphics/gpaint/files/patch-src::util.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/util.c.orig	Mon Aug 16 16:09:49 2004
-+++ src/util.c	Mon Aug 16 16:10:57 2004
-@@ -995,7 +995,7 @@
-       break;
-                 
-    default:
--      
-+      break;
-    }
-    ibuf->mx = x;
-    ibuf->my = y;
-@@ -1147,7 +1147,7 @@
-       break;
-          
-    default:
--      
-+      break;
-    }
-    ibuf->lx = INT_MIN;
-    ibuf->ly = INT_MIN;
diff --git a/graphics/gpaint/pkg-descr b/graphics/gpaint/pkg-descr
index 5435a26c822d..a1a5c5eff0ab 100644
--- a/graphics/gpaint/pkg-descr
+++ b/graphics/gpaint/pkg-descr
@@ -1,16 +1,17 @@
-This is gpaint, a small-scale painting program for GNOME, the GNU Desktop. 
-Gpaint does not attempt to compete with GIMP.  Think of GIMP is like Photoshop as
-gpaint is like Windows Paint.
+This is gpaint, a small-scale painting program for GNOME, the GNU
+Desktop. Gpaint does not attempt to compete with GIMP.  Think of GIMP
+is like Photoshop as gpaint is like Windows Paint.
 
-Gpaint is still work in progress and many features are still being developed. 
-However, gpaint is useable already for small image markups.
+Gpaint is still work in progress and many features are still being
+developed. However, gpaint is useable already for small image markups.
 
-A large part of gpaint is derived from xpaint 2.4.9, authored by David Koblas
-and later Torsten Martinsen.  Gpaint also uses the gtkscrolframe widget (taking
-from eog 0.5) by Federco Mena-Quintero.
+A large part of gpaint is derived from xpaint 2.4.9, authored by David
+Koblas and later Torsten Martinsen.  Gpaint also uses the gtkscrolframe
+widget (taking from eog 0.5) by Federco Mena-Quintero.
 
-Future plans include the implementation of missing features, printing support,
-and turning gpaint into a Bonobo component for simple image editing tasks.
+Future plans include the implementation of missing features, printing
+support, and turning gpaint into a Bonobo component for simple image
+editing tasks.
 
 For bugs or general comments please send mail to Andy Tai, atai@atai.org
 
diff --git a/graphics/gpaint/pkg-plist b/graphics/gpaint/pkg-plist
deleted file mode 100644
index 2d4caeda40a2..000000000000
--- a/graphics/gpaint/pkg-plist
+++ /dev/null
@@ -1,68 +0,0 @@
-bin/gpaint
-share/gnome/pixmaps/gpaint/about_pict.xpm
-share/gnome/pixmaps/gpaint/arcOp.xpm
-share/gnome/pixmaps/gpaint/arrow.png
-share/gnome/pixmaps/gpaint/arrow.xpm
-share/gnome/pixmaps/gpaint/babygnu_l.xpm
-share/gnome/pixmaps/gpaint/background.xbm
-share/gnome/pixmaps/gpaint/boxOp.xpm
-share/gnome/pixmaps/gpaint/brushOp.xpm
-share/gnome/pixmaps/gpaint/checkmark.xbm
-share/gnome/pixmaps/gpaint/clineOp.xpm
-share/gnome/pixmaps/gpaint/converttoxpm.pl
-share/gnome/pixmaps/gpaint/curveOp.xpm
-share/gnome/pixmaps/gpaint/defspray.xbm
-share/gnome/pixmaps/gpaint/dergates.jpg
-share/gnome/pixmaps/gpaint/dotPenOp.xpm
-share/gnome/pixmaps/gpaint/dynPenOp.xpm
-share/gnome/pixmaps/gpaint/eraseOp.xpm
-share/gnome/pixmaps/gpaint/eraseOp.xpm.new
-share/gnome/pixmaps/gpaint/fboxOp.xpm
-share/gnome/pixmaps/gpaint/ffillOp.xpm
-share/gnome/pixmaps/gpaint/ffreehandOp.xpm
-share/gnome/pixmaps/gpaint/fillOp.xpm
-share/gnome/pixmaps/gpaint/filled.xpm
-share/gnome/pixmaps/gpaint/fovalOp.xpm
-share/gnome/pixmaps/gpaint/fpolyOp.xpm
-share/gnome/pixmaps/gpaint/freehandOp.xpm
-share/gnome/pixmaps/gpaint/lassoOp.xpm
-share/gnome/pixmaps/gpaint/lineOp.xpm
-share/gnome/pixmaps/gpaint/makepixmaps.pl
-share/gnome/pixmaps/gpaint/ovalOp.xpm
-share/gnome/pixmaps/gpaint/paintA.xpm
-share/gnome/pixmaps/gpaint/paintB.xpm
-share/gnome/pixmaps/gpaint/paintC.xpm
-share/gnome/pixmaps/gpaint/paintD.xpm
-share/gnome/pixmaps/gpaint/paintE.xpm
-share/gnome/pixmaps/gpaint/paintF.xpm
-share/gnome/pixmaps/gpaint/paintG.xpm
-share/gnome/pixmaps/gpaint/paintH.xpm
-share/gnome/pixmaps/gpaint/paintI.xpm
-share/gnome/pixmaps/gpaint/paintJ.xpm
-share/gnome/pixmaps/gpaint/paintK.xpm
-share/gnome/pixmaps/gpaint/paintL.xpm
-share/gnome/pixmaps/gpaint/paintM.xpm
-share/gnome/pixmaps/gpaint/paintN.xpm
-share/gnome/pixmaps/gpaint/paintO.xpm
-share/gnome/pixmaps/gpaint/paintP.xpm
-share/gnome/pixmaps/gpaint/paintQ.xpm
-share/gnome/pixmaps/gpaint/paintR.xpm
-share/gnome/pixmaps/gpaint/paintS.xpm
-share/gnome/pixmaps/gpaint/paintT.xpm
-share/gnome/pixmaps/gpaint/pencilOp.xpm
-share/gnome/pixmaps/gpaint/polyOp.xpm
-share/gnome/pixmaps/gpaint/pullright.xbm
-share/gnome/pixmaps/gpaint/put_in_name.pl
-share/gnome/pixmaps/gpaint/rayOp.xpm
-share/gnome/pixmaps/gpaint/selectOp.xpm
-share/gnome/pixmaps/gpaint/selpolyOp.xpm
-share/gnome/pixmaps/gpaint/smearOp.xpm
-share/gnome/pixmaps/gpaint/sprayOp.xpm
-share/gnome/pixmaps/gpaint/textOp.xpm
-share/gnome/pixmaps/gpaint/tfillOp.xpm
-share/gnome/pixmaps/gpaint/unfilled.xpm
-share/gnome/pixmaps/gpaint/wait1.xbm
-share/gnome/pixmaps/gpaint/wait2.xbm
-share/gnome/pixmaps/gpaint/wait3.xbm
-share/gnome/pixmaps/gpaint/wait4.xbm
-@dirrm share/gnome/pixmaps/gpaint