4 files changed, 41 insertions, 26 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 4cea7d4d190e..a46cf1eddd38 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpaint
 PORTVERSION=	2.9.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
@@ -12,19 +12,20 @@ COMMENT=	Simple paint program
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		openjpeg:${PORTSDIR}/graphics/openjpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
-		freetype:${PORTSDIR}/print/freetype2 \
-		jbig:${PORTSDIR}/graphics/jbigkit \
-		Xaw3dxft:${PORTSDIR}/x11-toolkits/libxaw3dxft
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libjbig.so:${PORTSDIR}/graphics/jbigkit \
+		libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft
 RUN_DEPENDS=	psselect:${PORTSDIR}/print/psutils
 
 USE_BZIP2=	yes
 USE_XORG=	xft xmu xpm
 USE_AUTOTOOLS=	libtool
 USE_GHOSTSCRIPT_RUN=yes
+GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -39,9 +40,6 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's/-ldl //' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
-	@${REINPLACE_CMD} -Ee 's:/etc(/X11/app-defaults):${PREFIX}/lib\1:' \
-		-e '/xaw_incdir/s,/usr/include,${LOCALBASE}/include,' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \
 		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
 		${WRKSRC}/rw/Makefile.in
diff --git a/graphics/xpaint/files/patch-Makefile.in b/graphics/xpaint/files/patch-Makefile.in
index 8ce15f0932e6..5f81ea3a5cd1 100644
--- a/graphics/xpaint/files/patch-Makefile.in
+++ b/graphics/xpaint/files/patch-Makefile.in
@@ -1,6 +1,20 @@
---- Makefile.in.orig	2013-07-31 11:35:58.000000000 +0800
-+++ Makefile.in	2013-07-31 11:40:10.000000000 +0800
-@@ -1009,10 +1009,10 @@
+--- Makefile.in.orig	2013-01-26 15:21:12.000000000 +0100
++++ Makefile.in	2013-09-16 13:34:14.000000000 +0200
+@@ -283,7 +283,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ BINDIR = $(prefix)/bin
+ SHAREDIR = $(prefix)/share/xpaint
+-XAPPLOADDIR = /etc/X11/app-defaults
++XAPPLOADDIR = /usr/local/lib/X11/app-defaults
+ PRINT_COMMAND = lpr
+ LPCCMD = /usr/sbin/lpc status
+ #define LPCCMD 
+@@ -1005,14 +1005,14 @@ docs: INSTALL README TODO ChangeLog
+ .PHONY:
+ 
+ version.h:
+-	rm -f xaw_incdir ; ln -s /usr/include/X11/Xaw3dxft xaw_incdir
++	rm -f xaw_incdir ; ln -s /usr/local/include/X11/Xaw3dxft xaw_incdir
  	echo "#define XPAINT_VERSION \"$(PACKAGE_VERSION)\"" > version.h
  
  substads: substads.c
@@ -13,20 +27,23 @@
  
  DefaultRC.txt.h: substads DefaultRC
  	./substads -ad2c DefaultRC $@
-@@ -1020,10 +1020,8 @@
+@@ -1020,8 +1020,7 @@ DefaultRC.txt.h: substads DefaultRC
  messages.h: preproc
  	./preproc > messages.h
  
 -XPaint.ad: app-defaults
 -	$(CC) substads.c -o substads
--	cd app-defaults ; \
--	../substads -appdefs \
 +XPaint.ad: substads app-defaults
-+	./substads -appdefs \
+ 	cd app-defaults ; \
+ 	../substads -appdefs \
  	            XPAINT_VERSION $(PACKAGE_VERSION) \
- 		    XPAINT_SHAREDIR $(SHAREDIR) \
+@@ -1029,12 +1028,12 @@ XPaint.ad: app-defaults
  		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
-@@ -1034,7 +1032,7 @@
+ 		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
+ 		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
+-	cp -p app-defaults/out/XPaint XPaint.ad
++	cp -p out/XPaint ../XPaint.ad
+ 
  XPaint.ad.h: substads XPaint.ad
  	./substads -ad2c XPaint.ad $@
  
diff --git a/graphics/xpaint/files/patch-rw_rwTable.c b/graphics/xpaint/files/patch-rw_rwTable.c
index 905d887101c2..71b10adb04db 100644
--- a/graphics/xpaint/files/patch-rw_rwTable.c
+++ b/graphics/xpaint/files/patch-rw_rwTable.c
@@ -1,6 +1,6 @@
---- rw/rwTable.c.orig	2010-04-09 14:27:03.000000000 +0900
-+++ rw/rwTable.c	2010-05-29 13:28:58.000000000 +0900
-@@ -296,7 +296,7 @@
+--- rw/rwTable.c.orig	2012-02-08 09:08:02.000000000 +0100
++++ rw/rwTable.c	2013-09-16 13:27:46.000000000 +0200
+@@ -339,7 +339,7 @@ RWtableGetWriterList()
  char *
  RWGetMsg()
  {
diff --git a/graphics/xpaint/files/patch-util_Makefile b/graphics/xpaint/files/patch-util_Makefile
index 21fb62062db7..b9c07d54c3a9 100644
--- a/graphics/xpaint/files/patch-util_Makefile
+++ b/graphics/xpaint/files/patch-util_Makefile
@@ -1,5 +1,5 @@
---- util/Makefile.bak	2012-02-05 15:14:24.000000000 +0100
-+++ util/Makefile	2012-02-18 23:14:26.000000000 +0100
+--- util/Makefile.orig	2012-02-05 15:14:24.000000000 +0100
++++ util/Makefile	2013-09-16 13:27:46.000000000 +0200
 @@ -1,13 +1,11 @@
 -GCC = gcc
 -CPP = g++ -fpermissive
@@ -16,7 +16,7 @@
  
  pgf2pnm: main.cpp pnm.cpp
  	@if [ -x /usr/include/libpgf ] ; then \
-@@ -15,25 +13,25 @@
+@@ -15,25 +13,25 @@ pgf2pnm: main.cpp pnm.cpp
  	$(CPP) -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \
  	$(CPP) -o pgf2pnm main.o pnm.o -lpgf ; \
  	else \