Date: Sat, 18 Mar 2000 07:09:49 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17464: Update port: graphics/xpaint to 2.5.7 Message-ID: <200003181509.HAA55132@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17464 >Category: ports >Synopsis: Update port: graphics/xpaint to 2.5.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 18 07:10:04 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.5.7 New file: patches/patch-ab patches/patch-ac patches/patch-ad patches/patch-ae patches/patch-af patches/patch-ag >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/xpaint/Makefile graphics/xpaint/Makefile --- /usr/ports/graphics/xpaint/Makefile Wed Sep 8 07:13:49 1999 +++ graphics/xpaint/Makefile Fri Mar 17 02:47:50 2000 @@ -1,25 +1,24 @@ -# New ports collection makefile for: xpaint -# Version required: 2.5.6 -# Date created: 2 Jan 1995 -# Whom: swallace +# New ports collection makefile for: xpaint +# Version required: 2.5.7 +# Date created: 2 Jan 1995 +# Whom: swallace # # $FreeBSD: ports/graphics/xpaint/Makefile,v 1.36 1999/09/07 10:45:30 steve Exp $ # -DISTNAME= xpaint-2.5.6 +DISTNAME= xpaint-2.5.7 CATEGORIES= graphics -MASTER_SITES= http://www.image.dk/~torsten/xpaint/ \ - ftp://ftp.win.or.jp/pub/graphics/ +MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/ \ + ftp://ftp.win.ne.jp/pub/graphics/ MAINTAINER= jseger@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff.4:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ Xpm.4:${PORTSDIR}/graphics/xpm \ png.3:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/xpaint -USE_IMAKE= yes +USE_IMAKE= yes MAN1= xpaint.1 .include <bsd.port.mk> diff -urN /usr/ports/graphics/xpaint/files/md5 graphics/xpaint/files/md5 --- /usr/ports/graphics/xpaint/files/md5 Fri Dec 11 20:20:24 1998 +++ graphics/xpaint/files/md5 Fri Mar 17 00:48:55 2000 @@ -1 +1 @@ -MD5 (xpaint-2.5.6.tar.gz) = 16ca24ab07a59ed1a69ef59b7a541f2c +MD5 (xpaint-2.5.7.tar.gz) = 878f6773a46ad2354772b17b1a9f3963 diff -urN /usr/ports/graphics/xpaint/patches/patch-aa graphics/xpaint/patches/patch-aa --- /usr/ports/graphics/xpaint/patches/patch-aa Wed Nov 25 14:06:28 1998 +++ graphics/xpaint/patches/patch-aa Fri Mar 17 03:24:19 2000 @@ -1,13 +1,19 @@ ---- Local.config.orig Mon Nov 23 23:09:51 1998 -+++ Local.config Mon Nov 23 23:10:04 1998 -@@ -142,8 +142,8 @@ +--- Local.config.orig Sun Jun 28 03:43:56 1998 ++++ Local.config Fri Mar 17 00:32:44 2000 +@@ -142,9 +142,11 @@ #if defined(FreeBSDArchitecture) ARCH_DEFINES = -DHAVE_PARAM_H -TIFF_INCLUDE = -I/usr/local/include/tiff34 -TIFF_LIB = -L/usr/local/lib -ltiff34 -+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 +-JPEG_INCLUDE = -I/usr/local/include +-JPEG_LIB = -L/usr/local/lib -ljpeg +-XPM_INCLUDE = -I/usr/X11R6/include/X11 ++TIFF_INCLUDE = -I${LOCALBASE}/include ++TIFF_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ltiff ++JPEG_INCLUDE = -I${LOCALBASE}/include ++JPEG_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ljpeg ++PNG_INCLUDE = -I${LOCALBASE}/include ++PNG_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -lpng -lz ++XPM_INCLUDE = -I$(INCDIR)/X11 + #endif diff -urN /usr/ports/graphics/xpaint/patches/patch-ab graphics/xpaint/patches/patch-ab --- /usr/ports/graphics/xpaint/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ graphics/xpaint/patches/patch-ab Fri Mar 17 00:46:27 2000 @@ -0,0 +1,20 @@ +--- fileName.c.orig Wed Feb 25 05:38:43 1998 ++++ fileName.c Fri Mar 17 00:46:02 2000 +@@ -37,7 +37,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> +-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN32__) ++#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN32__) || defined(__FreeBSD__) + #include <dirent.h> + #else + #include <sys/dir.h> +@@ -375,7 +375,7 @@ + setCWD(arg_t * arg, char *dir) + { + DIR *dirp; +-#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN32__) ++#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN32__) || defined(__FreeBSD__) + struct dirent *e; + #else + struct direct *e; diff -urN /usr/ports/graphics/xpaint/patches/patch-ac graphics/xpaint/patches/patch-ac --- /usr/ports/graphics/xpaint/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ graphics/xpaint/patches/patch-ac Fri Mar 17 01:18:42 2000 @@ -0,0 +1,11 @@ +--- main.c.orig Wed Jun 10 06:14:27 1998 ++++ main.c Fri Mar 17 01:18:33 2000 +@@ -275,7 +275,7 @@ + } + + +-void ++int + main(int argc, char *argv[]) + { + Display *dpy; diff -urN /usr/ports/graphics/xpaint/patches/patch-ad graphics/xpaint/patches/patch-ad --- /usr/ports/graphics/xpaint/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ graphics/xpaint/patches/patch-ad Fri Mar 17 04:59:33 2000 @@ -0,0 +1,20 @@ +--- misc.h.orig Wed Jun 10 06:07:47 1998 ++++ misc.h Fri Mar 17 01:34:25 2000 +@@ -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); diff -urN /usr/ports/graphics/xpaint/patches/patch-ae graphics/xpaint/patches/patch-ae --- /usr/ports/graphics/xpaint/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ graphics/xpaint/patches/patch-ae Fri Mar 17 04:59:49 2000 @@ -0,0 +1,47 @@ +--- readRC.c.orig Tue Jun 25 17:50:39 1996 ++++ readRC.c Fri Mar 17 01:27:49 2000 +@@ -30,11 +30,13 @@ + #include <unistd.h> + #endif + ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + #ifdef __STDC__ + extern char *mktemp(char *); + #else + extern char *mktemp(); + #endif /* __STDC__ */ ++#endif + + #define RC_FILENAME ".XPaintrc" + +@@ -64,6 +66,9 @@ + static FILE * + openTemp(char **np) + { ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ int fd; ++#endif + char *n; + char xx[256]; + +@@ -72,11 +77,20 @@ + + strcpy(xx, n); + strcat(xx, "/XPaintXXXXXXX"); ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ if ((fd = mkstemp(xx) < 0)) ++ return (FILE *) NULL; ++ tempName[++tempIndex] = XtNewString(n); ++ if (np != NULL) ++ *np = tempName[tempIndex]; ++ return fdopen(fd, "w"); ++#else + n = mktemp(xx); + tempName[++tempIndex] = XtNewString(n); + if (np != NULL) + *np = tempName[tempIndex]; + return fopen(tempName[tempIndex], "w"); ++#endif + } + + static void diff -urN /usr/ports/graphics/xpaint/patches/patch-af graphics/xpaint/patches/patch-af --- /usr/ports/graphics/xpaint/patches/patch-af Thu Jan 1 09:00:00 1970 +++ graphics/xpaint/patches/patch-af Fri Mar 17 05:00:07 2000 @@ -0,0 +1,27 @@ +--- rw/libpnmrw.c.orig Wed Jun 10 06:08:57 1998 ++++ rw/libpnmrw.c Fri Mar 17 01:40:21 2000 +@@ -46,7 +46,7 @@ + + void *malloc(int); + void free(void *); +-#if defined(__EMX__) || defined(__CYGWIN32__) ++#if defined(__EMX__) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + #include <errno.h> + #endif + +@@ -131,6 +131,7 @@ + static void + pm_perror(char *reason) + { ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + #if defined(BSD4_4) + __const extern char *__const sys_errlist[]; + #else +@@ -140,6 +141,7 @@ + #endif + #if !defined(__EMX__) || defined(__CYGWIN32__) + extern int errno; ++#endif + #endif + char *e; + diff -urN /usr/ports/graphics/xpaint/patches/patch-ag graphics/xpaint/patches/patch-ag --- /usr/ports/graphics/xpaint/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ graphics/xpaint/patches/patch-ag Fri Mar 17 02:13:22 2000 @@ -0,0 +1,18 @@ +--- rw/rwTable.c.orig Wed Jun 10 06:09:32 1998 ++++ rw/rwTable.c Fri Mar 17 01:20:54 2000 +@@ -231,6 +231,7 @@ + char * + RWGetMsg() + { ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + #if defined(BSD4_4) + __const extern char *__const sys_errlist[]; + #else +@@ -239,6 +240,7 @@ + #endif + #endif + extern int errno; ++#endif + + if (RWtableMsg[0] == '\0') { + if (errno == 0) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003181509.HAA55132>