Attachment #11924 for bug #23274

View | Details | Raw Unified | Return to bug 23274
Collapse All | Expand All

Lines 6-12 Link Here

(-)graphics/xpaint/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= xpaint	8	PORTNAME= xpaint
9	PORTVERSION= 2.5.7	9	PORTVERSION= 2.6.1
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/ \	11	MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/ \
12	ftp://ftp.win.ne.jp/pub/graphics/	12	ftp://ftp.win.ne.jp/pub/graphics/
Lines 16-22 Link Here
16	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \	16	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
17	png.4:${PORTSDIR}/graphics/png	17	png.4:${PORTSDIR}/graphics/png
18		18
19	WRKSRC= ${WRKDIR}/xpaint	19	WRKSRC= ${WRKDIR}/${PORTNAME}
20	USE_IMAKE= yes	20	USE_IMAKE= yes
21	USE_XPM= yes	21	USE_XPM= yes
22	MAN1= xpaint.1	22	MAN1= xpaint.1

Line 1 Link Here

(-)graphics/xpaint/distinfo (-1 / +1 lines)
1	MD5 (xpaint-2.5.7.tar.gz) = 878f6773a46ad2354772b17b1a9f3963	1	MD5 (xpaint-2.6.1.tar.gz) = 0d3f8e265ae2e9cf121a10242444370e




--- 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(__CYGWIN__)
+#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__FreeBSD__)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
@@ -395,7 +395,7 @@
 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__)
     struct dirent *e;
 #else
     struct direct *e;

Lines 1-11 Link Here

(-)graphics/xpaint/files/patch-ac (-11 lines)
1	--- main.c.orig Wed Jun 10 06:14:27 1998
2	+++ main.c Fri Mar 17 01:18:33 2000
3	@@ -275,7 +275,7 @@
4	}
5
6
7	-void
8	+int
9	main(int argc, char *argv[])
10	{
11	Display *dpy;




--- 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);




--- 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(__CYGWIN__)
+#if defined(__EMX__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #include <errno.h>
 #endif
 

 #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

Return to bug 23274

Lines 1-20 Link Here

(-)graphics/xpaint/files/patch-ab (-7 / +7 lines)
1	--- fileName.c.orig Wed Feb 25 05:38:43 1998	1	--- fileName.c.orig Wed Oct 4 00:11:54 2000
2	+++ fileName.c Fri Mar 17 00:46:02 2000	2	+++ fileName.c Wed Oct 4 00:13:04 2000
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	#include <stdio.h>	4	#include <stdio.h>
5	#include <sys/types.h>	5	#include <sys/types.h>
6	#include <sys/stat.h>	6	#include <sys/stat.h>
7	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN32__)	7	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__)
8	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN32__) \|\| defined(__FreeBSD__)	8	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
9	#include <dirent.h>	9	#include <dirent.h>
10	#else	10	#else
11	#include <sys/dir.h>	11	#include <sys/dir.h>
12	@@ -375,7 +375,7 @@	12	@@ -395,7 +395,7 @@
13	setCWD(arg_t * arg, char *dir)	13	setCWD(arg_t * arg, char *dir)
14	{	14	{
15	DIR *dirp;	15	DIR *dirp;
16	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN32__)	16	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__)
17	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN32__) \|\| defined(__FreeBSD__)	17	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
18	struct dirent *e;	18	struct dirent *e;
19	#else	19	#else
20	struct direct *e;	20	struct direct *e;

Lines 1-20 Link Here

(-)graphics/xpaint/files/patch-ad (-20 lines)
1	--- misc.h.orig Wed Jun 10 06:07:47 1998
2	+++ misc.h Fri Mar 17 01:34:25 2000
3	@@ -23,7 +23,7 @@
4	long random(void);
5	#endif
6
7	-#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__)
8	+#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__OpenBSD__)
9	#if defined(BSD4_4) \|\| defined(HPArchitecture) \|\| defined(SGIArchitecture) \|\| defined(_AIX) \|\| defined(_SCO_DS)
10	void srandom(unsigned int);
11	#else
12	@@ -102,7 +102,7 @@
13	void GetDefaultWH(int w, int h);
14	char *GetDefaultRC(void);
15	void SetIconImage(Widget w);
16	-void main(int argc, char *argv[]);
17	+int main(int argc, char *argv[]);
18
19	/* misc.c */
20	Widget GetToplevel(Widget w);

Lines 1-11 Link Here

(-)graphics/xpaint/files/patch-af (-6 / +6 lines)
1	--- rw/libpnmrw.c.orig Wed Jun 10 06:08:57 1998	1	--- rw/libpnmrw.c.orig Wed Oct 4 00:16:52 2000
2	+++ rw/libpnmrw.c Fri Mar 17 01:40:21 2000	2	+++ rw/libpnmrw.c Wed Oct 4 00:18:10 2000
3	@@ -46,7 +46,7 @@	3	@@ -46,7 +46,7 @@
4		4
5	void *malloc(int);	5	void *malloc(int);
6	void free(void *);	6	void free(void *);
7	-#if defined(__EMX__) \|\| defined(__CYGWIN32__)	7	-#if defined(__EMX__) \|\| defined(__CYGWIN__)
8	+#if defined(__EMX__) \|\| defined(__CYGWIN32__) \|\| defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__)	8	+#if defined(__EMX__) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__)
9	#include <errno.h>	9	#include <errno.h>
10	#endif	10	#endif
11		11
Lines 17-25 Link Here
17	#if defined(BSD4_4)	17	#if defined(BSD4_4)
18	__const extern char *__const sys_errlist[];	18	__const extern char *__const sys_errlist[];
19	#else	19	#else
20	@@ -140,6 +141,7 @@	20	@@ -146,6 +147,7 @@
21	#endif	21	#endif
22	#if !defined(__EMX__) \|\| defined(__CYGWIN32__)	22	#if !defined(__EMX__) \|\| defined(__CYGWIN__)
23	extern int errno;	23	extern int errno;
24	+#endif	24	+#endif
25	#endif	25	#endif