Date: Fri, 6 Oct 2000 15:09:22 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: misc/21799: Update port: graphics/xpaint to 2.6.1 Message-ID: <20001006220922.4CAFB37B503@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21799 >Category: misc >Synopsis: Update port: graphics/xpaint to 2.6.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 06 15:10:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.6.1 Remove file: patches/patch-ac patches/patch-ad >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/xpaint/Makefile graphics/xpaint/Makefile --- /usr/ports/graphics/xpaint/Makefile Thu Aug 3 21:16:00 2000 +++ graphics/xpaint/Makefile Wed Oct 4 00:08:49 2000 @@ -6,7 +6,7 @@ # PORTNAME= xpaint -PORTVERSION= 2.5.7 +PORTVERSION= 2.6.1 CATEGORIES= graphics MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/ \ ftp://ftp.win.ne.jp/pub/graphics/ @@ -16,7 +16,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.4:${PORTSDIR}/graphics/png -WRKSRC= ${WRKDIR}/xpaint +WRKSRC= ${WRKDIR}/${PORTNAME} USE_IMAKE= yes USE_XPM= yes MAN1= xpaint.1 diff -urN /usr/ports/graphics/xpaint/files/md5 graphics/xpaint/files/md5 --- /usr/ports/graphics/xpaint/files/md5 Wed Mar 22 00:45:57 2000 +++ graphics/xpaint/files/md5 Wed Oct 4 00:09:32 2000 @@ -1 +1 @@ -MD5 (xpaint-2.5.7.tar.gz) = 878f6773a46ad2354772b17b1a9f3963 +MD5 (xpaint-2.6.1.tar.gz) = 0d3f8e265ae2e9cf121a10242444370e diff -urN /usr/ports/graphics/xpaint/patches/patch-ab graphics/xpaint/patches/patch-ab --- /usr/ports/graphics/xpaint/patches/patch-ab Wed Mar 22 00:45:58 2000 +++ graphics/xpaint/patches/patch-ab Wed Oct 4 00:13:17 2000 @@ -1,20 +1,20 @@ ---- fileName.c.orig Wed Feb 25 05:38:43 1998 -+++ fileName.c Fri Mar 17 00:46:02 2000 +--- fileName.c.orig Wed Oct 4 00:11:54 2000 ++++ fileName.c Wed Oct 4 00:13:04 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__) +-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) ++#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__FreeBSD__) #include <dirent.h> #else #include <sys/dir.h> -@@ -375,7 +375,7 @@ +@@ -395,7 +395,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__) +-#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__) ++#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__) || 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 Wed Mar 22 00:45:58 2000 +++ graphics/xpaint/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 Wed Mar 22 00:45:58 2000 +++ graphics/xpaint/patches/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- 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-af graphics/xpaint/patches/patch-af --- /usr/ports/graphics/xpaint/patches/patch-af Wed Mar 22 00:45:59 2000 +++ graphics/xpaint/patches/patch-af Wed Oct 4 00:18:25 2000 @@ -1,11 +1,11 @@ ---- rw/libpnmrw.c.orig Wed Jun 10 06:08:57 1998 -+++ rw/libpnmrw.c Fri Mar 17 01:40:21 2000 +--- rw/libpnmrw.c.orig Wed Oct 4 00:16:52 2000 ++++ rw/libpnmrw.c Wed Oct 4 00:18:10 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__) +-#if defined(__EMX__) || defined(__CYGWIN__) ++#if defined(__EMX__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #include <errno.h> #endif @@ -17,9 +17,9 @@ #if defined(BSD4_4) __const extern char *__const sys_errlist[]; #else -@@ -140,6 +141,7 @@ +@@ -146,6 +147,7 @@ #endif - #if !defined(__EMX__) || defined(__CYGWIN32__) + #if !defined(__EMX__) || defined(__CYGWIN__) extern int errno; +#endif #endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001006220922.4CAFB37B503>