Update to 2.7.7, about four years worth of changes.

Some patches from FreeBSD.
2005-05-24 19:49:28 +00:00 · 2005-05-24 19:49:28 +00:00 · 8b927d68e0
commit 8b927d68e0
parent 9c29b93d58
12 changed files with 294 additions and 123 deletions
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.34 2005/04/17 21:24:25 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2005/05/24 19:49:28 naddy Exp $

 COMMENT=		"simple paint program"

-VERSION=		2.6.2
-DISTNAME=		xpaint-${VERSION}
+DISTNAME=		xpaint-2.7.7
 CATEGORIES=		graphics x11

-HOMEPAGE=		http://home.worldonline.dk/torsten/xpaint/
+HOMEPAGE=		http://sf-xpaint.sourceforge.net/

-MASTER_SITES=		${HOMEPAGE}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
+EXTRACT_SUFX=		.tar.bz2

-# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@ -19,12 +18,11 @@ WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c m z

 FAKE=			lib
 LIB_DEPENDS=		jpeg.62::graphics/jpeg \
-			tiff.35::graphics/tiff \
-			png.2::graphics/png
+			tiff.36::graphics/tiff \
+			png.4::graphics/png

 CONFIGURE_STYLE= 	imake
-
-WRKDIST=		${WRKDIR}/xpaint
+ALL_TARGET=		xaw

 NO_REGRESS=		Yes

--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@ -1,4 +1,4 @@
-MD5 (xpaint-2.6.2.tar.gz) = 9f22460f15a189721573d88454ce3d41
-RMD160 (xpaint-2.6.2.tar.gz) = e811cb8004374287a706d70691b1b6c335e3ea5c
-SHA1 (xpaint-2.6.2.tar.gz) = 33afbb8360e9654fc1ddb04dc739388d3b8584c5
-SIZE (xpaint-2.6.2.tar.gz) = 265319
+MD5 (xpaint-2.7.7.tar.bz2) = e6086b87adf5bac8e6d207248b760eff
+RMD160 (xpaint-2.7.7.tar.bz2) = 0edecaaebc04c6adfc11d5883cfafe9ebd7066f6
+SHA1 (xpaint-2.7.7.tar.bz2) = c7e170af9a75098d2763346268726d33e0a5713b
+SIZE (xpaint-2.7.7.tar.bz2) = 403208
--- a/graphics/xpaint/patches/patch-Imakefile
+++ b/graphics/xpaint/patches/patch-Imakefile
@ -0,0 +1,30 @@
+$OpenBSD: patch-Imakefile,v 1.1 2005/05/24 19:49:28 naddy Exp $
+--- Imakefile.orig	Wed Apr 27 14:59:37 2005
+++ Imakefile	Tue May 24 11:39:09 2005
+@@ -102,7 +102,7 @@ SGI_LIB = -limage
+ #endif
+ 
+ DEPLIBS = always xpaint.man XPaint.ad
+-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
+ 
+ SUBDIRS = rw
+ 
+@@ -152,7 +152,7 @@ install::
+ 
+ xaw::
+ 	-$(RM) $(XAWDEPENDS)
+-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
+	-$(RM) xaw_incdir ; ln -sf ${X11BASE}/include/X11/Xaw xaw_incdir
+ 	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs			
+ 	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
+ 	xmkmf -a ; make
+@@ -164,7 +164,7 @@ xaw::
+ 
+ xaw3d::
+ 	-$(RM) $(XAWDEPENDS)
+-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw3d xaw_incdir	
+	-$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw3d xaw_incdir	
+ 	echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
+ 	echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
+ 	xmkmf ; cd rw ; xmkmf ; cd .. ; make
--- a/graphics/xpaint/patches/patch-Local_config
+++ b/graphics/xpaint/patches/patch-Local_config
@ -1,7 +1,7 @@
-$OpenBSD: patch-Local_config,v 1.2 2005/04/17 21:24:25 espie Exp $
--- Local.config.orig	Tue Jun 12 21:26:45 2001
-+++ Local.config	Sun Apr 17 23:22:55 2005
-@@ -135,6 +135,17 @@ XCOMM CDEBUGFLAGS =
+$OpenBSD: patch-Local_config,v 1.3 2005/05/24 19:49:28 naddy Exp $
+--- Local.config.orig	Sat Apr 30 15:33:14 2005
+++ Local.config	Tue May 24 12:15:44 2005
+@@ -162,6 +162,22 @@ XCOMM CDEBUGFLAGS =
 
 XCOMM This should take care of everything needed for BSD.
 
@ -14,6 +14,11 @@ $OpenBSD: patch-Local_config,v 1.2 2005/04/17 21:24:25 espie Exp $
 +PNG_INCLUDE  = -I${DEPBASE}/include/libpng
 +PNG_LIB      = -L${DEPBASE}/lib -lpng -lz
 +XPM_INCLUDE  = -I${X11BASE}/include/X11
+BINDIR       = ${TRUEPREFIX}/bin
+MANDIR       = ${TRUEPREFIX}/man
+SHAREDIR     = ${TRUEPREFIX}/share/xpaint
+XAPPLOADDIR  = ${TRUEPREFIX}/lib/X11/app-defaults
+EDITOR       = xterm -fn 9x15 -cr green -ms red -bg lightyellow -fg black -e vi
 +#endif
 +
 #if defined(NetBSDArchitecture) || defined(BSD386Architecture)
--- a/graphics/xpaint/patches/patch-bitmaps_Imakefile
+++ b/graphics/xpaint/patches/patch-bitmaps_Imakefile
@ -0,0 +1,138 @@
+$OpenBSD: patch-bitmaps_Imakefile,v 1.1 2005/05/24 19:49:28 naddy Exp $
+--- bitmaps/Imakefile.orig	Tue May 24 11:09:06 2005
+++ bitmaps/Imakefile	Tue May 24 11:09:19 2005
+@@ -1,5 +1,133 @@
+ MISC = Imakefile
+-SRCS = *\/*
+SRCS = \
+	big_tools/arcOp.xpm \
+	big_tools/arrowOp.xpm \
+	big_tools/boxOp.xpm \
+	big_tools/brokenlineOp.xpm \
+	big_tools/brushOp.xpm \
+	big_tools/dotPenOp.xpm \
+	big_tools/dynPenOp.xpm \
+	big_tools/eraseOp.xpm \
+	big_tools/fillOp.xpm \
+	big_tools/filledBoxOp.xpm \
+	big_tools/filledFreehandOp.xpm \
+	big_tools/filledOvalOp.xpm \
+	big_tools/filledPolygonOp.xpm \
+	big_tools/filledSplineOp.xpm \
+	big_tools/fractalFillOp.xpm \
+	big_tools/freehandOp.xpm \
+	big_tools/gradientFillOp.xpm \
+	big_tools/lineOp.xpm \
+	big_tools/ovalOp.xpm \
+	big_tools/pencilOp.xpm \
+	big_tools/polygonOp.xpm \
+	big_tools/rayOp.xpm \
+	big_tools/selectBoxOp.xpm \
+	big_tools/selectFreehandOp.xpm \
+	big_tools/selectOvalOp.xpm \
+	big_tools/selectPolygonOp.xpm \
+	big_tools/selectSplineOp.xpm \
+	big_tools/smearOp.xpm \
+	big_tools/splineOp.xpm \
+	big_tools/sprayOp.xpm \
+	big_tools/textOp.xpm \
+	brushes/paintA.xpm \
+	brushes/paintB.xpm \
+	brushes/paintC.xpm \
+	brushes/paintD.xpm \
+	brushes/paintE.xpm \
+	brushes/paintF.xpm \
+	brushes/paintG.xpm \
+	brushes/paintH.xpm \
+	brushes/paintI.xpm \
+	brushes/paintJ.xpm \
+	brushes/paintK.xpm \
+	brushes/paintL.xpm \
+	brushes/paintM.xpm \
+	brushes/paintN.xpm \
+	brushes/paintO.xpm \
+	brushes/paintP.xpm \
+	brushes/paintQ.xpm \
+	brushes/paintR.xpm \
+	brushes/paintS.xpm \
+	brushes/paintT.xpm \
+	small_tools/arcOp.xpm \
+	small_tools/arrowOp.xpm \
+	small_tools/boxOp.xpm \
+	small_tools/brokenlineOp.xpm \
+	small_tools/brushOp.xpm \
+	small_tools/dotPenOp.xpm \
+	small_tools/dynPenOp.xpm \
+	small_tools/eraseOp.xpm \
+	small_tools/fillOp.xpm \
+	small_tools/filledBoxOp.xpm \
+	small_tools/filledFreehandOp.xpm \
+	small_tools/filledOvalOp.xpm \
+	small_tools/filledPolygonOp.xpm \
+	small_tools/filledSplineOp.xpm \
+	small_tools/fractalFillOp.xpm \
+	small_tools/freehandOp.xpm \
+	small_tools/gradientFillOp.xpm \
+	small_tools/lineOp.xpm \
+	small_tools/ovalOp.xpm \
+	small_tools/pencilOp.xpm \
+	small_tools/polygonOp.xpm \
+	small_tools/rayOp.xpm \
+	small_tools/selectBoxOp.xpm \
+	small_tools/selectFreehandOp.xpm \
+	small_tools/selectOp.xpm \
+	small_tools/selectOvalOp.xpm \
+	small_tools/selectPolygonOp.xpm \
+	small_tools/selectSplineOp.xpm \
+	small_tools/smearOp.xpm \
+	small_tools/splineOp.xpm \
+	small_tools/sprayOp.xpm \
+	small_tools/textOp.xpm \
+	tools/arcOp.xpm \
+	tools/arrowOp.xpm \
+	tools/boxOp.xpm \
+	tools/brokenlineOp.xpm \
+	tools/brushOp.xpm \
+	tools/dotPenOp.xpm \
+	tools/dynPenOp.xpm \
+	tools/eraseOp.xpm \
+	tools/fillOp.xpm \
+	tools/filledBoxOp.xpm \
+	tools/filledFreehandOp.xpm \
+	tools/filledOvalOp.xpm \
+	tools/filledPolygonOp.xpm \
+	tools/filledSplineOp.xpm \
+	tools/fractalFillOp.xpm \
+	tools/freehandOp.xpm \
+	tools/gradientFillOp.xpm \
+	tools/lineOp.xpm \
+	tools/ovalOp.xpm \
+	tools/pencilOp.xpm \
+	tools/polygonOp.xpm \
+	tools/rayOp.xpm \
+	tools/selectBoxOp.xpm \
+	tools/selectFreehandOp.xpm \
+	tools/selectOp.xpm \
+	tools/selectOvalOp.xpm \
+	tools/selectPolygonOp.xpm \
+	tools/selectSplineOp.xpm \
+	tools/smearOp.xpm \
+	tools/splineOp.xpm \
+	tools/sprayOp.xpm \
+	tools/textOp.xpm \
+	xbm/arrows.xbm \
+	xbm/background.xbm \
+	xbm/checkmark.xbm \
+	xbm/defspray.xbm \
+	xbm/pullright.xbm \
+	xbm/wait1.xbm \
+	xbm/wait2.xbm \
+	xbm/wait3.xbm \
+	xbm/wait4.xbm \
+	xpm/eye.xpm \
+	xpm/fill0.xpm \
+	xpm/fill1.xpm \
+	xpm/fill2.xpm
+ 
+ makelist:
+ 	sh -c 'for i in '"$(TEXT) $(SRCS) $(MISC) $(HDRS)"' ; do \
--- a/graphics/xpaint/patches/patch-fileName_c
+++ b/graphics/xpaint/patches/patch-fileName_c
@ -0,0 +1,21 @@
+$OpenBSD: patch-fileName_c,v 1.1 2005/05/24 19:49:28 naddy Exp $
+--- fileName.c.orig	Mon May 23 23:12:09 2005
+++ fileName.c	Mon May 23 23:13:09 2005
+@@ -39,7 +39,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS )
+#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <dirent.h>
+ #else
+ #include <sys/dir.h>
+@@ -455,7 +455,7 @@ static void 
+ setCWD(arg_t * arg, char *dir)
+ {
+     DIR *dirp;
+-#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__)
+#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+     struct dirent *e;
+ #else
+     struct direct *e;
--- a/graphics/xpaint/patches/patch-misc_h
+++ b/graphics/xpaint/patches/patch-misc_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-misc_h,v 1.1 2002/09/07 07:12:12 pvalchev Exp $
--- misc.h.orig	Mon Oct  2 14:56:30 2000
-+++ misc.h	Sat Sep  7 01:02:32 2002
-@@ -23,7 +23,7 @@
- long random(void);
- #endif
- 
-#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
-+#if !defined(linux) & !defined(__EMX__) & !defined(__OpenBSD__) & !defined(__CYGWIN__)
- #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
- void srandom(unsigned int);
- #else
--- a/graphics/xpaint/patches/patch-readRC_c
+++ b/graphics/xpaint/patches/patch-readRC_c
@ -1,39 +0,0 @@
-$OpenBSD: patch-readRC_c,v 1.1 2002/09/07 07:12:12 pvalchev Exp $
--- readRC.c.orig	Tue Jun 12 13:04:32 2001
-+++ readRC.c	Sat Sep  7 01:02:32 2002
-@@ -30,12 +30,6 @@
- #include <unistd.h>
- #endif
- 
-#ifdef __STDC__
-extern char *mktemp(char *);
-#else
-extern char *mktemp();
-#endif /* __STDC__ */
-
- #define RC_FILENAME	".XPaintrc"
- 
- static String defaultRC[] =
-@@ -66,17 +60,18 @@ openTemp(char **np)
- {
-     char *n;
-     char xx[256];
-+    int fd;
- 
-     if ((n = getenv("TMPDIR")) == NULL)
- 	n = "/tmp";
- 
-    strcpy(xx, n);
-    strcat(xx, "/XPaintXXXXXXX");
-    n = mktemp(xx);
-+    snprintf(xx, 256, "%s/%s", n, "/XPaintXXXXXXX");
-+    fd = mkstemp(xx);
-+    n = xx;
-     tempName[++tempIndex] = XtNewString(n);
-     if (np != NULL)
- 	*np = tempName[tempIndex];
-    return fopen(tempName[tempIndex], "w");
-+    return fdopen(fd, "w");
- }
- 
- static void 
--- a/graphics/xpaint/patches/patch-rw_libpnmrw_c
+++ b/graphics/xpaint/patches/patch-rw_libpnmrw_c
@ -1,16 +1,7 @@
-$OpenBSD: patch-rw_libpnmrw_c,v 1.3 2002/09/07 07:09:13 pvalchev Exp $
--- rw/libpnmrw.c.orig	Fri Sep  6 23:24:14 2002
-+++ rw/libpnmrw.c	Fri Sep  6 23:38:07 2002
-@@ -46,7 +46,7 @@
- 
- void *malloc(int);
- void free(void *);
-#if defined(__EMX__) || defined(__CYGWIN__)
-+#if defined(__EMX__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) 
- #include <errno.h>
- #endif
- 
-@@ -131,6 +131,7 @@ pm_freearray(char **its, int rows)
+$OpenBSD: patch-rw_libpnmrw_c,v 1.4 2005/05/24 19:49:28 naddy Exp $
+--- rw/libpnmrw.c.orig	Mon May 23 22:58:49 2005
+++ rw/libpnmrw.c	Mon May 23 23:01:23 2005
+@@ -132,6 +132,7 @@ pm_freearray(char **its, int rows)
 static void
 pm_perror(char *reason)
 {
@ -19,14 +10,14 @@ $OpenBSD: patch-rw_libpnmrw_c,v 1.3 2002/09/07 07:09:13 pvalchev Exp $
     __const extern char *__const sys_errlist[];
 #else
@@ -147,6 +148,7 @@ pm_perror(char *reason)
- #if !defined(__EMX__) || defined(__CYGWIN__)
-     extern int errno;
+ #endif
+ #endif
 #endif
 +#endif
     char *e;
 
-     e = sys_errlist[errno];
-@@ -286,7 +288,7 @@ pbm_readmagicnumber(FILE * file)
+ #ifdef MISSING_STRERROR
+@@ -287,7 +289,7 @@ pbm_readmagicnumber(FILE * file)
 static int
 pbm_getint(FILE * file)
 {
--- a/graphics/xpaint/patches/patch-rw_readWriteXBM_c
+++ b/graphics/xpaint/patches/patch-rw_readWriteXBM_c
@ -1,23 +0,0 @@
-$OpenBSD: patch-rw_readWriteXBM_c,v 1.1 2003/01/18 09:03:33 pvalchev Exp $
--- rw/readWriteXBM.c.orig	Sat Sep  2 16:08:33 2000
-+++ rw/readWriteXBM.c	Sat Jan 18 01:48:50 2003
-@@ -17,8 +17,6 @@
- #include <stdio.h>
- #include "image.h"
- 
-int strncmp(char *, char *, int);
-
- #define TRUE 1
- #define FALSE 0
- 
-@@ -54,9 +52,8 @@ int strncmp(char *, char *, int);
-  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include <ctype.h>
-
-extern char *strrchr(char *, char);
- 
- 
- #define MAX_SIZE 255
--- a/graphics/xpaint/patches/patch-rw_rwTable_c
+++ b/graphics/xpaint/patches/patch-rw_rwTable_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-rw_rwTable_c,v 1.3 2002/09/07 07:09:13 pvalchev Exp $
--- rw/rwTable.c.orig	Fri Sep  6 23:44:29 2002
-+++ rw/rwTable.c	Fri Sep  6 23:50:40 2002
-@@ -231,6 +231,7 @@ RWtableGetWriterList()
+$OpenBSD: patch-rw_rwTable_c,v 1.4 2005/05/24 19:49:28 naddy Exp $
+--- rw/rwTable.c.orig	Mon May 23 23:02:00 2005
+++ rw/rwTable.c	Mon May 23 23:03:31 2005
+@@ -249,6 +249,7 @@ RWtableGetWriterList()
 char *
 RWGetMsg()
 {
@ -9,12 +9,11 @@ $OpenBSD: patch-rw_rwTable_c,v 1.3 2002/09/07 07:09:13 pvalchev Exp $
 #if defined(BSD4_4)
     __const extern char *__const sys_errlist[];
 #else
-@@ -245,7 +246,7 @@ RWGetMsg()
- #endif
- #endif
-     extern int errno;
-
+@@ -258,6 +259,7 @@ RWGetMsg()
+ #  define sys_errlist _sys_errlist
+ #else
+     extern char *sys_errlist[];
 +#endif
-     if (RWtableMsg[0] == '\0') {
- 	if (errno == 0)
- 	    return "";
+ #endif
+ #endif
+ #endif
--- a/graphics/xpaint/pkg/PLIST
+++ b/graphics/xpaint/pkg/PLIST
@ -1,4 +1,67 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 00:50:12 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/05/24 19:49:28 naddy Exp $
 bin/xpaint
 lib/X11/app-defaults/XPaint
-@man man/cat1/xpaint.0
+lib/X11/app-defaults/XPaint_es
+lib/X11/app-defaults/XPaint_fr
+man/xpaint.0
+share/xpaint/
+share/xpaint/XPaintIcon.xpm
+share/xpaint/c_scripts/
+share/xpaint/c_scripts/3d_curves/
+share/xpaint/c_scripts/3d_curves/helicoid.c
+share/xpaint/c_scripts/3d_curves/lissajous.c
+share/xpaint/c_scripts/3d_surfaces/
+share/xpaint/c_scripts/3d_surfaces/ellipsoid.c
+share/xpaint/c_scripts/3d_surfaces/heart.c
+share/xpaint/c_scripts/3d_surfaces/hyperboloid.c
+share/xpaint/c_scripts/3d_surfaces/polyhedra.c
+share/xpaint/c_scripts/3d_surfaces/torus.c
+share/xpaint/c_scripts/3d_surfaces/trefoil.c
+share/xpaint/c_scripts/3d_surfaces/waves.c
+share/xpaint/c_scripts/filters/
+share/xpaint/c_scripts/filters/leftright.c
+share/xpaint/c_scripts/filters/mapping.c
+share/xpaint/c_scripts/filters/merge.c
+share/xpaint/c_scripts/filters/permute.c
+share/xpaint/c_scripts/filters/rotleft.c
+share/xpaint/c_scripts/filters/rotright.c
+share/xpaint/c_scripts/filters/updown.c
+share/xpaint/c_scripts/images/
+share/xpaint/c_scripts/images/random.c
+share/xpaint/c_scripts/layers/
+share/xpaint/c_scripts/layers/combine.c
+share/xpaint/c_scripts/procedures/
+share/xpaint/c_scripts/procedures/setmemory.c
+share/xpaint/help/
+share/xpaint/help/Help
+share/xpaint/help/Help_es
+share/xpaint/help/Help_fr
+share/xpaint/include/
+share/xpaint/include/Colormap.h
+share/xpaint/include/ColormapP.h
+share/xpaint/include/DefaultRC.txt.h
+share/xpaint/include/Paint.h
+share/xpaint/include/PaintP.h
+share/xpaint/include/XPaint.ad.h
+share/xpaint/include/Xpaint.h
+share/xpaint/include/Xpaint3d.h
+share/xpaint/include/color.h
+share/xpaint/include/graphic.h
+share/xpaint/include/hash.h
+share/xpaint/include/image.h
+share/xpaint/include/menu.h
+share/xpaint/include/messages.h
+share/xpaint/include/misc.h
+share/xpaint/include/operation.h
+share/xpaint/include/ops.h
+share/xpaint/include/palette.h
+share/xpaint/include/patchlevel.h
+share/xpaint/include/protocol.h
+share/xpaint/include/rc.h
+share/xpaint/include/region.h
+share/xpaint/include/text.h
+share/xpaint/include/xpaint.h
+share/xpaint/messages/
+share/xpaint/messages/Messages
+share/xpaint/messages/Messages_es
+share/xpaint/messages/Messages_fr