diff options
-rw-r--r-- | graphics/xpaint/Makefile | 9 | ||||
-rw-r--r-- | graphics/xpaint/distinfo | 17 | ||||
-rw-r--r-- | graphics/xpaint/patches/patch-ae | 4 | ||||
-rw-r--r-- | graphics/xpaint/patches/patch-ag | 70 | ||||
-rw-r--r-- | graphics/xpaint/patches/patch-ah | 8 |
5 files changed, 51 insertions, 57 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index eaf9c0982eb..720e3a1a798 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.46 2005/03/10 14:11:23 tv Exp $ +# $NetBSD: Makefile,v 1.47 2005/03/31 11:08:16 adam Exp $ -DISTNAME= xpaint-2.7.3 +DISTNAME= xpaint-2.7.6 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= tech-pkg@NetBSD.org +MAINTAINER= adam@NetBSD.org HOMEPAGE= http://sf-xpaint.sourceforge.net/ COMMENT= Simple paint program @@ -13,7 +14,7 @@ USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_IMAKE= yes -BUILD_TARGET= xaw95static +BUILD_TARGET= xaw95 MAKE_ENV+= XMKMF="${XMKMF}" SUBST_CLASSES= foo diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo index e5d2df06da3..35dac881ce1 100644 --- a/graphics/xpaint/distinfo +++ b/graphics/xpaint/distinfo @@ -1,12 +1,15 @@ -$NetBSD: distinfo,v 1.12 2005/02/24 08:45:15 agc Exp $ +$NetBSD: distinfo,v 1.13 2005/03/31 11:08:16 adam Exp $ -SHA1 (xpaint-2.7.3.tar.bz2) = a8c19e59d2093df7d23638b85a45e058957be69e -RMD160 (xpaint-2.7.3.tar.bz2) = bc8a1ef787a1d1ee09eb3c926eb316c092402a12 -Size (xpaint-2.7.3.tar.bz2) = 615007 bytes +SHA1 (xpaint-2.7.6.tar.bz2) = 7e00fb28ed6b14264c2cef59cd2ea8cf7a7f7ab4 +RMD160 (xpaint-2.7.6.tar.bz2) = 8823b1f266210437647eb360377fe409b912f75b +Size (xpaint-2.7.6.tar.bz2) = 378529 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 (patch-aa) = 87ddea42b6497f0c38a56f2915b9896d2858b63d SHA1 (patch-ab) = c10aa13fc4c02a6251354360585436d6075981bc SHA1 (patch-ac) = e98edf325d9ebe167022b7985b8487f0a08002e6 -SHA1 (patch-ae) = d7d903409ae8fe34ca7c64caac85d2211292134d +SHA1 (patch-ae) = 06c83b24a484841473a477b2bfb049247fd9472d SHA1 (patch-af) = 2eaa700fa3e56b00e4b5106d1d5efac7377f58d1 -SHA1 (patch-ag) = b7518174030fe951d2d00437efef8550d5cb9cc7 -SHA1 (patch-ah) = aa49732f29be3fb96d212c5b2e4e6cd3d9be4fc5 +SHA1 (patch-ag) = 11a4b686c9af6dfc4e9d1f3e0b090a43bdf1080b +SHA1 (patch-ah) = e9f3ac7e9d4dc21a4a65b862eddc4f3acb21571d diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae index ae41b12e9ff..30e7b9d0a15 100644 --- a/graphics/xpaint/patches/patch-ae +++ b/graphics/xpaint/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.5 2004/11/03 15:54:31 adam Exp $ +$NetBSD: patch-ae,v 1.6 2005/03/31 11:08:16 adam Exp $ ---- operation.c.orig 2003-07-24 20:30:56.000000000 +0000 +--- operation.c.orig 2005-03-21 20:36:37.000000000 +0000 +++ operation.c @@ -993,8 +993,10 @@ static PaintMenuItem fontMenu[] = fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"), diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag index 78c7058ef79..acdc8f1f1a6 100644 --- a/graphics/xpaint/patches/patch-ag +++ b/graphics/xpaint/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.5 2004/11/03 15:54:31 adam Exp $ +$NetBSD: patch-ag,v 1.6 2005/03/31 11:08:16 adam Exp $ ---- Imakefile.orig 2004-09-03 07:19:00.000000000 +0000 +--- Imakefile.orig 2005-03-20 20:15:32.000000000 +0000 +++ Imakefile -@@ -97,7 +97,7 @@ SGI_LIB = -limage +@@ -98,7 +98,7 @@ SGI_LIB = -limage #endif DEPLIBS = always xpaint.man XPaint.ad @@ -11,42 +11,32 @@ $NetBSD: patch-ag,v 1.5 2004/11/03 15:54:31 adam Exp $ SUBDIRS = rw -@@ -133,10 +133,10 @@ install:: - xaw:: - -$(RM) $(XAW95DEPENDS) - echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs -- xmkmf ; make -+ ${XMKMF} ; ${MAKE} +@@ -151,7 +151,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 !!" +@@ -191,12 +191,15 @@ nextaw:: + @echo "Variants are 'make xaw3d' and 'make xaw95'" + @echo "" - libXaw95.so: -- cd xaw95-1.1.4 ; xmkmf -a ; make -+ cd xaw95-1.1.4 ; ${XMKMF} ; ${MAKE} - -$(RM) libXaw95.so libXaw95.a - -$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so - -$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a -@@ -147,13 +147,13 @@ xaw95:: libXaw95.so - -$(RM) $(XAW95DEPENDS) +-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 ; make -+ ${XMKMF} ; ${MAKE} - - xaw95static:: libXaw95.a - -$(RM) $(XAW95DEPENDS) - echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs -- echo "SYS_LIBRARIES = ./libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs -- xmkmf ; make -+ echo "SYS_LIBRARIES = ./xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs -+ ${XMKMF} ; ${MAKE} - - clean:: - -$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.* -@@ -162,7 +162,7 @@ clean:: - cd share/messages ; $(RM) *~ - cd app-defaults ; $(RM) core *~ substads - cd app-defaults/out ; $(RM) -f Xpaint* -- cd xaw95-1.1.4 ; if [ -r Makefile ] ; then make clean ; fi -+ cd xaw95-1.1.4 ; if [ -r Makefile ] ; then ${MAKE} clean ; fi - - includes:: XPaint.ad.h DefaultRC.txt.h messages.h - cd bitmaps; $(RM) tools; \ +- 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 index f43d5a9ae13..502fb7865c7 100644 --- a/graphics/xpaint/patches/patch-ah +++ b/graphics/xpaint/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2004/03/20 22:30:36 bouyer Exp $ +$NetBSD: patch-ah,v 1.2 2005/03/31 11:08:16 adam Exp $ ---- xaw95-1.1.4/Imakefile.orig Sat Mar 20 22:45:21 2004 -+++ xaw95-1.1.4/Imakefile Sat Mar 20 22:45:42 2004 -@@ -233,7 +233,7 @@ +--- ../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 |