Changes 2.7.8:

* Bug fixes
Pkgsrc:
* Use Xaw3d from now on (which is the recommended way)

6 files changed, 38 insertions, 83 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 8f0a9240942..00857315458 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.50 2005/05/23 11:37:22 adam Exp $
+# $NetBSD: Makefile,v 1.51 2005/09/06 14:53:36 adam Exp $
 
-DISTNAME=       xpaint-2.7.7
+DISTNAME=       xpaint-2.7.8
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
 EXTRACT_SUFX=	.tar.bz2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xaw95-1.1.4${EXTRACT_SUFX}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://sf-xpaint.sourceforge.net/
 COMMENT=	Simple paint program
 
-USE_TOOLS+=		gmake
 USE_IMAKE=      	yes
+USE_TOOLS+=		gmake
+MAKE_ENV+=		XMKMF="${XMKMF}"
+BUILD_TARGET=		xaw3dg
 
-BUILD_TARGET=	xaw95
-MAKE_ENV+=	XMKMF="${XMKMF}"
-
-SUBST_CLASSES=	    foo
-SUBST_STAGE.foo=    pre-configure
-SUBST_FILES.foo=    Local.config
-SUBST_SED.foo=	    -e "s|\$${LOCALBASE}|${LOCALBASE}|g" \
-		    -e "s|\$${X11BASE}|${X11BASE}|g" \
-		    -e "s|\$${XPMDIR}|${BUILDLINK_PREFIX.xpm}|g"
+SUBST_CLASSES=		foo
+SUBST_STAGE.foo=	pre-configure
+SUBST_FILES.foo=	Local.config configure
+SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
+			-e "s|@PREFIX@|${PREFIX}|g" \
+			-e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \
+			-e "s|@XPMDIR@|${BUILDLINK_PREFIX.xpm}|g"
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/Xaw3d/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 27e70e43144..480ebb28afc 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.14 2005/05/23 11:37:22 adam Exp $
+$NetBSD: distinfo,v 1.15 2005/09/06 14:53:36 adam Exp $
 
-SHA1 (xpaint-2.7.7.tar.bz2) = c7e170af9a75098d2763346268726d33e0a5713b
-RMD160 (xpaint-2.7.7.tar.bz2) = 0edecaaebc04c6adfc11d5883cfafe9ebd7066f6
-Size (xpaint-2.7.7.tar.bz2) = 403208 bytes
-SHA1 (xaw95-1.1.4.tar.bz2) = a40773cb5d7625bc3e86db4aa6c83e6ea44b0bc0
-RMD160 (xaw95-1.1.4.tar.bz2) = 4eb55b64652b829c92411b5271b149f6b9233895
-Size (xaw95-1.1.4.tar.bz2) = 215524 bytes
+SHA1 (xpaint-2.7.8.tar.bz2) = 5573996f293838abd892faaa73a31239c03f9b9a
+RMD160 (xpaint-2.7.8.tar.bz2) = edf4cdd5ee3f2af1d49eb4bb6618fc2dc3c138ff
+Size (xpaint-2.7.8.tar.bz2) = 415855 bytes
 SHA1 (patch-aa) = 87ddea42b6497f0c38a56f2915b9896d2858b63d
 SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556
-SHA1 (patch-ac) = f84ce15386a2ad3c72279c5534d5597d465dc4f2
+SHA1 (patch-ac) = 78ba5e1c2b0bb5e9abfd12783454d5b30499d5f0
+SHA1 (patch-ad) = dc12b553353bb5f8e70251ace8bf874c13aaa24f
 SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
-SHA1 (patch-af) = 2eaa700fa3e56b00e4b5106d1d5efac7377f58d1
-SHA1 (patch-ag) = 0a3288a404fed683f33c92860cd5a109476d6a78
-SHA1 (patch-ah) = e9f3ac7e9d4dc21a4a65b862eddc4f3acb21571d
+SHA1 (patch-af) = 7742b1c2e56ae8d3797765b3c477c8c46c9a0b07
+SHA1 (patch-ag) = 5191cb57084a746fec33dec105a8fe1750c6d8ae
diff --git a/graphics/xpaint/patches/patch-ac b/graphics/xpaint/patches/patch-ac
index d5dd844b834..91af3f62c53 100644
--- a/graphics/xpaint/patches/patch-ac
+++ b/graphics/xpaint/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2005/05/23 11:37:23 adam Exp $
+$NetBSD: patch-ac,v 1.8 2005/09/06 14:53:36 adam Exp $
 
---- rw/rwTable.c.orig	2005-04-10 08:52:02.000000000 +0000
+--- rw/rwTable.c.orig	2005-08-17 13:00:25.000000000 +0000
 +++ rw/rwTable.c
-@@ -249,6 +249,7 @@ RWtableGetWriterList()
+@@ -251,6 +251,7 @@ RWtableGetWriterList()
  char *
  RWGetMsg()
  {
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.7 2005/05/23 11:37:23 adam Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -262,6 +263,7 @@ RWGetMsg()
+@@ -264,6 +265,7 @@ RWGetMsg()
  #endif
  #endif
  #endif
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index 3616e1e264e..65593e4cb89 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.9 2004/11/03 15:54:31 adam Exp $
+$NetBSD: patch-af,v 1.10 2005/09/06 14:53:36 adam Exp $
 
 --- Local.config.orig	2004-09-05 08:14:53.000000000 +0000
 +++ Local.config
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.9 2004/11/03 15:54:31 adam Exp $
  
  DESTDIR = 
 -SHAREDIR = /usr/share/xpaint
-+SHAREDIR = $${X11PREFIX}/share/xpaint
++SHAREDIR = @PREFIX@/share/xpaint
  
  XCOMM Printing system defaults
  PRINT_COMMAND = lpr
@@ -26,12 +26,12 @@ $NetBSD: patch-af,v 1.9 2004/11/03 15:54:31 adam Exp $
  XCOMM  Make sure the path name to the library is correct.
  
 -XPM_LIB     = -L/usr/X11R6/lib -lXpm
-+XPM_LIB     = -L${XPMDIR}/lib -Wl,-R${XPMDIR}/lib -lXpm 
++XPM_LIB     = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm 
  
  XCOMM  Make sure this points to the location of the 'xpm.h' file.
  
 -XPM_INCLUDE = -I/usr/X11R6/include/X11
-+XPM_INCLUDE = -I${XPMDIR}/include/X11
++XPM_INCLUDE = -I@XPMDIR@/include/X11
  
  
  DEPENDFLAGS = -I./bitmaps
@@ -47,13 +47,13 @@ $NetBSD: patch-af,v 1.9 2004/11/03 15:54:31 adam Exp $
 -JPEG_LIB     = -L/usr/local/lib -ljpeg
 -XPM_INCLUDE = -I/usr/X11R6/include/X11
 -#endif
-+TIFF_INCLUDE = -I${LOCALBASE}/include
-+TIFF_LIB     = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltiff
-+JPEG_INCLUDE = -I${LOCALBASE}/include
-+JPEG_LIB     = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg
-+PNG_INCLUDE = -I${LOCALBASE}/include/png
-+PNG_LIB     = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpng -lz
-+XPM_INCLUDE = -I${XPMDIR}/include/X11
++TIFF_INCLUDE = -I@LOCALBASE@/include
++TIFF_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff
++JPEG_INCLUDE = -I@LOCALBASE@/include
++JPEG_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ljpeg
++PNG_INCLUDE = -I@LOCALBASE@/include/png
++PNG_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -lpng -lz
++XPM_INCLUDE = -I@XPMDIR@/include/X11
  
  #if defined(FreeBSDArchitecture)
  ARCH_DEFINES = -DHAVE_PARAM_H
diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag
index 6b77bd40970..0d63a5ce853 100644
--- a/graphics/xpaint/patches/patch-ag
+++ b/graphics/xpaint/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2005/05/23 11:37:23 adam Exp $
+$NetBSD: patch-ag,v 1.8 2005/09/06 14:53:36 adam Exp $
 
---- Imakefile.orig	2005-04-27 20:59:37.000000000 +0000
+--- Imakefile.orig	2005-06-03 12:26:03.000000000 +0000
 +++ Imakefile
 @@ -102,7 +102,7 @@ SGI_LIB = -limage
  #endif
@@ -11,32 +11,3 @@ $NetBSD: patch-ag,v 1.7 2005/05/23 11:37:23 adam Exp $
  
  SUBDIRS = rw
  
-@@ -155,7 +155,7 @@ xaw::
- 	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
- 	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs			
- 	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
--	xmkmf -a ; make
-+	${XMKMF} -a ; ${MAKE}
- 	@echo ""
- 	@echo "'xpaint' compiled with Xaw widgets (old and ugly)"
- 	@echo "You should rather use Xaw3d, neXtaw or Xaw95 !!"	
-@@ -195,12 +195,15 @@ nextaw::
- 	@echo "Variants are 'make xaw3d' and 'make xaw95'"
- 	@echo ""	
- 
--xaw95::
-+libXaw95.a:
-+	cd ../xaw95-1.1.4 ; ${XMKMF} ; ${MAKE}
-+
-+xaw95:: libXaw95.a
- 	-$(RM) $(XAWDEPENDS)
--	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw95 xaw_incdir	
-+	-$(RM) xaw_incdir ; ln -sf ${X11BASE}/include/X11/Xaw xaw_incdir	
- 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
--	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
--	xmkmf -a ; make
-+	echo "SYS_LIBRARIES = ../xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
-+	${XMKMF} -a ; ${MAKE}
- 	@echo ""	
- 	@echo "'xpaint' compiled with Xaw95 widgets"
- 	@echo "Another alternative is to use the Xaw3d widgets :"	
diff --git a/graphics/xpaint/patches/patch-ah b/graphics/xpaint/patches/patch-ah
deleted file mode 100644
index 502fb7865c7..00000000000
--- a/graphics/xpaint/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/03/31 11:08:16 adam Exp $
-
---- ../xaw95-1.1.4/Imakefile.orig	2002-10-27 21:34:55.000000000 +0000
-+++ ../xaw95-1.1.4/Imakefile
-@@ -233,7 +233,7 @@ YACC=YaccCmd
- all::
- 
- depend:: laygram.c laylex.c
--	cd exports ; ln -sf include X11
-+	-cd exports ; ln -sf include X11
- 
- #if DoSharedLib && SharedDataSeparation
- SpecialCObjectRule(sharedlib.o,NullParameter,$(SHLIBDEF))