- upgrade to version 2.6.1

- add HOMEPAGE
This commit is contained in:
kevlo 2001-06-13 03:53:39 +00:00
parent 1a805e9a49
commit d00bbe55da
12 changed files with 75 additions and 92 deletions

View File

@ -1,25 +1,28 @@
# $OpenBSD: Makefile,v 1.23 2001/05/24 02:27:44 kevlo Exp $
# $OpenBSD: Makefile,v 1.24 2001/06/13 03:53:39 kevlo Exp $
COMMENT= "simple paint program"
DISTNAME= xpaint-2.5.7
DISTNAME= xpaint-2.6.1
CATEGORIES= graphics x11
NEED_VERSION= 1.402
MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/
HOMEPAGE= http://home.worldonline.dk/~torsten/xpaint/
MAINTAINER= ports@openbsd.org
LICENSE_TYPE= BSD
# LICENSE_TYPE= BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= jpeg.62::graphics/jpeg \
tiff.35::graphics/tiff \
png.2::graphics/png
CONFIGURE_STYLE= imake
CONFIGURE_STYLE= imake
WRKDIST= ${WRKDIR}/xpaint

View File

@ -1,3 +1,3 @@
MD5 (xpaint-2.5.7.tar.gz) = 878f6773a46ad2354772b17b1a9f3963
RMD160 (xpaint-2.5.7.tar.gz) = 76dc9149d904398553e100f101ecaddbda80c397
SHA1 (xpaint-2.5.7.tar.gz) = 218efafe5b494f309fc427355c5da12d82703998
MD5 (xpaint-2.6.1.tar.gz) = 0d3f8e265ae2e9cf121a10242444370e
RMD160 (xpaint-2.6.1.tar.gz) = 1d13a8c4f4f209622f1405435d643465b510b676
SHA1 (xpaint-2.6.1.tar.gz) = a26d495bdb4190640756dbbfd214307e92422139

View File

@ -0,0 +1,17 @@
--- Local.config.orig Wed Jun 13 11:44:07 2001
+++ Local.config Wed Jun 13 12:03:54 2001
@@ -148,3 +148,14 @@
JPEG_LIB = -L/usr/local/lib -ljpeg
XPM_INCLUDE = -I/usr/X11R6/include/X11
#endif
+
+#if defined(OpenBSDArchitecture)
+ARCH_DEFINES = -DHAVE_PARAM_H
+TIFF_INCLUDE = -I${LOCALBASE}/include
+TIFF_LIB = -L${LOCALBASE}/lib -ltiff
+JPEG_INCLUDE = -I${LOCALBASE}/include
+JPEG_LIB = -L${LOCALBASE}/lib -ljpeg
+PNG_INCLUDE = -I${LOCALBASE}/include
+PNG_LIB = -L${LOCALBASE}/lib -lpng -lz
+XPM_INCLUDE = -I${X11BASE}/include/X11
+#endif

View File

@ -1,20 +0,0 @@
--- misc.h.orig Tue Jun 9 17:07:47 1998
+++ misc.h Fri Oct 29 18:06:35 1999
@@ -23,7 +23,7 @@
long random(void);
#endif
-#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__)
+#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,7 +102,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);

View File

@ -1,15 +0,0 @@
--- Local.config.~1~ Mon Mar 23 13:39:44 1998
+++ Local.config Fri Jul 3 19:11:27 1998
@@ -148,3 +148,12 @@
JPEG_LIB = -L/usr/local/lib -ljpeg
XPM_INCLUDE = -I/usr/X11R6/include/X11
#endif
+
+#if defined(OpenBSDArchitecture)
+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
+#endif

View File

@ -1,11 +0,0 @@
--- main.c.orig Tue Jun 9 17:14:27 1998
+++ main.c Fri Oct 29 18:07:30 1999
@@ -275,7 +275,7 @@
}
-void
+int
main(int argc, char *argv[])
{
Display *dpy;

View File

@ -1,29 +0,0 @@
--- rw/libpnmrw.c.~1~ Tue Jun 9 14:08:57 1998
+++ rw/libpnmrw.c Fri Jul 3 19:23:04 1998
@@ -16,6 +16,10 @@
#include <sys/param.h>
#endif
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#include <errno.h>
+#endif
+
#if defined(SVR2) || defined(SVR3) || defined(SVR4)
#ifndef SYSV
#define SYSV
@@ -131,6 +135,7 @@
static void
pm_perror(char *reason)
{
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
#if defined(BSD4_4)
__const extern char *__const sys_errlist[];
#else
@@ -140,6 +145,7 @@
#endif
#if !defined(__EMX__) || defined(__CYGWIN32__)
extern int errno;
+#endif
#endif
char *e;

View File

@ -0,0 +1,11 @@
--- misc.h.orig Wed Jun 13 11:40:31 2001
+++ misc.h Wed Jun 13 11:42:07 2001
@@ -23,7 +23,7 @@
long random(void);
#endif
-#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
+#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__OpenBSD__) & !defined(__CYGWIN__)
#if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
void srandom(unsigned int);
#else

View File

@ -1,5 +1,5 @@
--- readRC.c.orig Tue Jun 25 05:50:39 1996
+++ readRC.c Tue May 30 06:09:51 2000
--- readRC.c.orig Wed Jun 13 12:00:10 2001
+++ readRC.c Wed Jun 13 12:01:58 2001
@@ -30,12 +30,6 @@
#include <unistd.h>
#endif
@ -13,7 +13,7 @@
#define RC_FILENAME ".XPaintrc"
static String defaultRC[] =
@@ -66,17 +60,18 @@ openTemp(char **np)
@@ -66,17 +60,18 @@
{
char *n;
char xx[256];
@ -25,7 +25,7 @@
- strcpy(xx, n);
- strcat(xx, "/XPaintXXXXXXX");
- n = mktemp(xx);
+ snprintf(xx, 256, "%s/%s", n, "/XPaintXXXXXXX");
+ snprintf(xx, 256, "%s/%s", n, "/XPaintXXXXXXX");
+ fd = mkstemp(xx);
+ n = xx;
tempName[++tempIndex] = XtNewString(n);

View File

@ -0,0 +1,27 @@
--- rw/libpnmrw.c.orig Wed Jun 13 11:51:28 2001
+++ rw/libpnmrw.c Wed Jun 13 11:56:10 2001
@@ -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 @@
static void
pm_perror(char *reason)
{
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
#if defined(BSD4_4)
__const extern char *__const sys_errlist[];
#else
@@ -146,6 +147,7 @@
#endif
#if !defined(__EMX__) || defined(__CYGWIN__)
extern int errno;
+#endif
#endif
char *e;

View File

@ -1,5 +1,5 @@
--- rw/rwTable.c.~1~ Fri Jul 3 19:18:59 1998
+++ rw/rwTable.c Fri Jul 3 19:20:44 1998
--- rw/rwTable.c.orig Wed Jun 13 11:48:14 2001
+++ rw/rwTable.c Wed Jun 13 11:50:05 2001
@@ -231,6 +231,7 @@
char *
RWGetMsg()
@ -8,7 +8,7 @@
#if defined(BSD4_4)
__const extern char *__const sys_errlist[];
#else
@@ -239,6 +240,7 @@
@@ -245,6 +246,7 @@
#endif
#endif
extern int errno;

View File

@ -1,5 +1,5 @@
XPaint 2.4.6
XPaint is a color image editing tool which features most standard paint
program options. It allows for the editing of mul- tiple images simultaneously
and supports various formats, including PPM, XBM, TIFF, etc.
WWW: ${HOMEPAGE}