diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 9068ce9c809..72ca644e68b 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -3,10 +3,10 @@ # Date created: December 2, 1997 # Whom: Angelos D. Keromytis # -# $OpenBSD: Makefile,v 1.3 1998/05/06 02:54:46 marc Exp $ +# $OpenBSD: Makefile,v 1.4 1998/05/20 09:45:04 form Exp $ # -DISTNAME= xpaint-2.5 +DISTNAME= xpaint-2.5.4 CATEGORIES= graphics x11 MASTER_SITES= http://www.danbbs.dk/~torsten/xpaint/ diff --git a/graphics/xpaint/files/md5 b/graphics/xpaint/files/md5 index 5ef04ec5818..7b7fa0d56fa 100644 --- a/graphics/xpaint/files/md5 +++ b/graphics/xpaint/files/md5 @@ -1 +1 @@ -MD5 (xpaint-2.5.tar.gz) = 62438af07c1b7ed777c57be35b7db2a3 +MD5 (xpaint-2.5.4.tar.gz) = 8749efd22a3a0645d4262d5b78c925b7 diff --git a/graphics/xpaint/patches/patch-aa b/graphics/xpaint/patches/patch-aa index 093da3052bb..dead3b4a004 100644 --- a/graphics/xpaint/patches/patch-aa +++ b/graphics/xpaint/patches/patch-aa @@ -1,63 +1,36 @@ ---- operation.c.orig Wed Aug 13 21:45:28 1997 -+++ operation.c Fri Aug 29 13:47:20 1997 -@@ -43,34 +43,34 @@ - #include "cutCopyPaste.h" - - /* Pixmaps for toolbox icons */ --#include "brushOp.xpm" --#include "eraseOp.xpm" --#include "sprayOp.xpm" --#include "pencilOp.xpm" --#include "dotPenOp.xpm" --#include "dynPenOp.xpm" --#include "lineOp.xpm" --#include "arcOp.xpm" --#include "fillOp.xpm" --#include "tfillOp.xpm" -+#include "bitmaps/brushOp.xpm" -+#include "bitmaps/eraseOp.xpm" -+#include "bitmaps/sprayOp.xpm" -+#include "bitmaps/pencilOp.xpm" -+#include "bitmaps/dotPenOp.xpm" -+#include "bitmaps/dynPenOp.xpm" -+#include "bitmaps/lineOp.xpm" -+#include "bitmaps/arcOp.xpm" -+#include "bitmaps/fillOp.xpm" -+#include "bitmaps/tfillOp.xpm" - #ifdef FEATURE_FRACTAL --#include "ffillOp.xpm" -+#include "bitmaps/ffillOp.xpm" - #endif --#include "smearOp.xpm" --#include "textOp.xpm" --#include "selectOp.xpm" --#include "boxOp.xpm" --#include "rayOp.xpm" --#include "fboxOp.xpm" --#include "ovalOp.xpm" --#include "fovalOp.xpm" --#include "lassoOp.xpm" --#include "clineOp.xpm" --#include "polyOp.xpm" --#include "fpolyOp.xpm" --#include "freehandOp.xpm" --#include "ffreehandOp.xpm" --#include "selpolyOp.xpm" -+#include "bitmaps/smearOp.xpm" -+#include "bitmaps/textOp.xpm" -+#include "bitmaps/selectOp.xpm" -+#include "bitmaps/boxOp.xpm" -+#include "bitmaps/rayOp.xpm" -+#include "bitmaps/fboxOp.xpm" -+#include "bitmaps/ovalOp.xpm" -+#include "bitmaps/fovalOp.xpm" -+#include "bitmaps/lassoOp.xpm" -+#include "bitmaps/clineOp.xpm" -+#include "bitmaps/polyOp.xpm" -+#include "bitmaps/fpolyOp.xpm" -+#include "bitmaps/freehandOp.xpm" -+#include "bitmaps/ffreehandOp.xpm" -+#include "bitmaps/selpolyOp.xpm" - - - +*** misc.h.orig Tue Mar 24 03:39:38 1998 +--- misc.h Wed May 20 16:16:04 1998 +*************** +*** 23,29 **** + long random(void); + #endif + +! #if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) + #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS) + void srandom(unsigned int); + #else +--- 23,29 ---- + long random(void); + #endif + +! #if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__OpenBSD__) + #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS) + void srandom(unsigned int); + #else +*************** +*** 102,108 **** + void GetDefaultWH(int *w, int *h); + char *GetDefaultRC(void); + void SetIconImage(Widget w); +! void main(int argc, char *argv[]); + + /* misc.c */ + Widget GetToplevel(Widget w); +--- 102,108 ---- + void GetDefaultWH(int *w, int *h); + char *GetDefaultRC(void); + void SetIconImage(Widget w); +! int main(int argc, char *argv[]); + + /* misc.c */ + Widget GetToplevel(Widget w); diff --git a/graphics/xpaint/patches/patch-ab b/graphics/xpaint/patches/patch-ab index 01365468594..f2888cc2505 100644 --- a/graphics/xpaint/patches/patch-ab +++ b/graphics/xpaint/patches/patch-ab @@ -1,14 +1,19 @@ ---- dynPenOp.c.orig Wed Aug 13 16:10:00 1997 -+++ dynPenOp.c Fri Aug 29 14:08:48 1997 -@@ -28,6 +28,11 @@ - #include "misc.h" - #include "Paint.h" - -+#ifndef HZ -+#include -+#define HZ CLK_TCK -+#endif -+ - #define XTIMEOUT ((unsigned long)(1.5*1000/HZ)) /* ms, should be larger than 1000/HZ */ - - typedef struct { +*** rw/writeTIFF.c.orig Wed May 20 16:09:47 1998 +--- rw/writeTIFF.c Wed May 20 16:10:06 1998 +*************** +*** 16,22 **** + + #include + #include +! #include + #include "image.h" + + #undef howmany +--- 16,22 ---- + + #include + #include +! #include + #include "image.h" + + #undef howmany diff --git a/graphics/xpaint/patches/patch-ac b/graphics/xpaint/patches/patch-ac index 617b8882413..16ce3414f8c 100644 --- a/graphics/xpaint/patches/patch-ac +++ b/graphics/xpaint/patches/patch-ac @@ -1,24 +1,19 @@ ---- misc.h.orig Wed Aug 13 11:36:39 1997 -+++ misc.h Tue May 5 12:28:51 1998 -@@ -23,9 +23,11 @@ - - #ifndef linux - #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) --void srandom(unsigned int); -+#endif - #else -+#if !defined(__OpenBSD__) - int srandom(unsigned int); -+void srandom(unsigned int); - #endif /* BSD4_4 */ - #endif /* linux */ - #endif -@@ -96,7 +98,7 @@ - void GetDefaultWH(int *w, int *h); - char *GetDefaultRC(void); - void SetIconImage(Widget w); --void main(int argc, char *argv[]); -+int main(int argc, char *argv[]); - - /* misc.c */ - Widget GetToplevel(Widget w); +*** Local.config.orig Wed May 20 16:11:55 1998 +--- Local.config Wed May 20 16:13:04 1998 +*************** +*** 140,146 **** + XPM_INCLUDE = -I/usr/X11R6/include/X11 + #endif + +! #if defined(FreeBSDArchitecture) + ARCH_DEFINES = -DHAVE_PARAM_H + TIFF_INCLUDE = -I/usr/local/include/tiff34 + TIFF_LIB = -L/usr/local/lib -ltiff34 +--- 140,146 ---- + XPM_INCLUDE = -I/usr/X11R6/include/X11 + #endif + +! #if defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) + ARCH_DEFINES = -DHAVE_PARAM_H + TIFF_INCLUDE = -I/usr/local/include/tiff34 + TIFF_LIB = -L/usr/local/lib -ltiff34 diff --git a/graphics/xpaint/patches/patch-ad b/graphics/xpaint/patches/patch-ad index e098369e67d..2e150f7227d 100644 --- a/graphics/xpaint/patches/patch-ad +++ b/graphics/xpaint/patches/patch-ad @@ -1,30 +1,19 @@ ---- Local.config.orig Wed Aug 13 11:36:11 1997 -+++ Local.config Tue May 5 12:20:50 1998 -@@ -57,8 +57,8 @@ - #define HaveTIFF - - #ifdef HaveTIFF --TIFF_LIB = -L/usr/local/lib -ltiff --TIFF_INCLUDE = -I/usr/local/include/tiff -+TIFF_LIB = -L/usr/local/lib -ltiff34 -+TIFF_INCLUDE = -I/usr/local/include - #endif - - XCOMM If you have the JPEG library, make HaveJPEG defined -@@ -80,7 +80,7 @@ - - #ifdef HavePNG - PNG_LIB = -L/usr/local/lib -lpng -lz --PNG_INCLUDE = -I/usr/local/include/png -+PNG_INCLUDE = -I/usr/local/include -I/usr/local/include/png - #endif - - XCOMM If you are running SunOS and get an error with the following undefined -@@ -131,7 +131,6 @@ - defined(BSD386Architecture) - ARCH_DEFINES = -DHAVE_PARAM_H - TIFF_INCLUDE = -I/usr/local/include --TIFF_LIB = -L/usr/local/lib -ltiff - JPEG_INCLUDE = -I/usr/local/include - JPEG_LIB = -L/usr/local/lib -ljpeg - XPM_INCLUDE = -I/usr/X11R6/include/X11 +*** main.c.orig Wed May 20 16:13:32 1998 +--- main.c Wed May 20 16:13:43 1998 +*************** +*** 275,281 **** + } + + +! void + main(int argc, char *argv[]) + { + Display *dpy; +--- 275,281 ---- + } + + +! int + main(int argc, char *argv[]) + { + Display *dpy; diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae index ae9ef1fd0b0..406e861f98c 100644 --- a/graphics/xpaint/patches/patch-ae +++ b/graphics/xpaint/patches/patch-ae @@ -1,44 +1,19 @@ -*** readRC.c.orig Tue Dec 2 22:45:27 1997 ---- readRC.c Tue Dec 2 22:47:59 1997 +*** rw/rwTable.c.orig Wed May 20 16:21:04 1998 +--- rw/rwTable.c Wed May 20 16:24:24 1998 *************** -*** 66,82 **** +*** 231,242 **** +--- 231,244 ---- + char * + RWGetMsg() { - char *n; - char xx[256]; ++ #if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(_NetBSD__) + #if defined(BSD4_4) + __const extern char *__const sys_errlist[]; + #else + extern char *sys_errlist[]; + #endif + extern int errno; ++ #endif - if ((n = getenv("TMPDIR")) == NULL) - n = "/tmp"; - - strcpy(xx, n); - strcat(xx, "/XPaintXXXXXXX"); -! n = mktemp(xx); - tempName[++tempIndex] = XtNewString(n); - if (np != NULL) - *np = tempName[tempIndex]; -! return fopen(tempName[tempIndex], "w"); - } - - static void ---- 66,87 ---- - { - char *n; - char xx[256]; -+ int fd; - - if ((n = getenv("TMPDIR")) == NULL) - n = "/tmp"; - - strcpy(xx, n); - strcat(xx, "/XPaintXXXXXXX"); -! fd = mkstemp(xx); -! if (fd == -1) -! return NULL; -! -! n = strdup(xx); - tempName[++tempIndex] = XtNewString(n); - if (np != NULL) - *np = tempName[tempIndex]; -! return fdopen(fd, "w"); - } - - static void + if (RWtableMsg[0] == '\0') { + if (errno == 0) diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af index 71e630adfc8..4d060341794 100644 --- a/graphics/xpaint/patches/patch-af +++ b/graphics/xpaint/patches/patch-af @@ -1,11 +1,19 @@ ---- rw/readTIFF.c.~1~ Tue Jun 25 01:50:41 1996 -+++ rw/readTIFF.c Tue May 5 12:37:21 1998 -@@ -16,7 +16,7 @@ - - #include - #include --#include "tiffio.h" -+#include - #include "image.h" - #include "rwTable.h" - +*** rw/readTIFF.c.orig Wed May 20 16:25:10 1998 +--- rw/readTIFF.c Wed May 20 16:25:34 1998 +*************** +*** 16,22 **** + + #include + #include +! #include "tiffio.h" + #include "image.h" + #include "rwTable.h" + +--- 16,22 ---- + + #include + #include +! #include + #include "image.h" + #include "rwTable.h" + diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag index d03e4f4e574..fa3fe1c51f4 100644 --- a/graphics/xpaint/patches/patch-ag +++ b/graphics/xpaint/patches/patch-ag @@ -1,11 +1,35 @@ ---- rw/writeTIFF.c.~1~ Tue Jun 25 01:50:41 1996 -+++ rw/writeTIFF.c Tue May 5 12:37:30 1998 -@@ -16,7 +16,7 @@ - - #include - #include --#include -+#include - #include "image.h" - - #undef howmany +*** rw/libpnmrw.c.orig Wed May 20 16:26:40 1998 +--- rw/libpnmrw.c Wed May 20 16:33:16 1998 +*************** +*** 16,21 **** +--- 16,25 ---- + #include + #endif + ++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ #include ++ #endif ++ + #if defined(SVR2) || defined(SVR3) || defined(SVR4) + #ifndef SYSV + #define SYSV +*************** +*** 131,136 **** +--- 135,141 ---- + static void + pm_perror(char *reason) + { ++ #if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) + #if defined(BSD4_4) + __const extern char *__const sys_errlist[]; + #else +*************** +*** 138,143 **** +--- 143,149 ---- + #endif + #if !defined(__EMX__) || defined(__CYGWIN32__) + extern int errno; ++ #endif + #endif + char *e; + diff --git a/graphics/xpaint/patches/patch-ah b/graphics/xpaint/patches/patch-ah deleted file mode 100644 index bfba2f7c13d..00000000000 --- a/graphics/xpaint/patches/patch-ah +++ /dev/null @@ -1,17 +0,0 @@ ---- main.c.~1~ Wed Aug 13 11:36:28 1997 -+++ main.c Tue May 5 12:44:49 1998 -@@ -197,7 +197,7 @@ - } - - --void -+int - main(int argc, char *argv[]) - { - Display *dpy; -@@ -369,4 +369,5 @@ - XtDispatchEvent(&event); - } - while (!Global.timeToDie); -+ return 0; - } diff --git a/graphics/xpaint/pkg/PLIST b/graphics/xpaint/pkg/PLIST index b051477e4d9..02c9a40a8a4 100644 --- a/graphics/xpaint/pkg/PLIST +++ b/graphics/xpaint/pkg/PLIST @@ -1,3 +1,3 @@ bin/xpaint -man/man1/xpaint.1 +man/cat1/xpaint.0 lib/X11/app-defaults/XPaint