pkgsrc/graphics/xpaint/patches/patch-af

$NetBSD: patch-af,v 1.13 2006/01/06 22:36:19 adam Exp $

--- Local.config.orig	2005-04-30 23:33:14.000000000 +0200
+++ Local.config
@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2
 XCOMM Local customization
 
 DESTDIR = 
-SHAREDIR = /usr/share/xpaint
+SHAREDIR = @PREFIX@/share/xpaint
 
 XCOMM Printing system defaults
 PRINT_COMMAND = lpr
@@ -70,6 +70,9 @@ XCOMM #endif
 
 #ifdef NetBSDArchitecture
 ARCH_DEFINES = -DHAVE_PARAM_H  
+#ifdef arm32Architecture
+CDEBUGFLAGS =
+#endif
 #endif
 
 #ifdef OS2Architecture
@@ -132,11 +135,11 @@ XCOMM
 XCOMM  You must have the XPM library.
 XCOMM  Make sure the path name to the library is correct.
 
-XPM_LIB     = -L/usr/X11R6/lib -lXpm
+XPM_LIB     = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm 
 
 XCOMM  Make sure this points to the location of the 'xpm.h' file.
 
-XPM_INCLUDE = -I/usr/X11R6/include/X11
+XPM_INCLUDE = -I@XPMDIR@/include/X11
 
 
 DEPENDFLAGS = -I./bitmaps
@@ -162,20 +165,11 @@ XCOMM CDEBUGFLAGS =
 
 XCOMM This should take care of everything needed for BSD.
 
-#if defined(NetBSDArchitecture) || 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
-#endif
-
-#if defined(FreeBSDArchitecture)
-ARCH_DEFINES = -DHAVE_PARAM_H
-TIFF_INCLUDE = -I/usr/local/include/tiff34
-TIFF_LIB     = -L/usr/local/lib -ltiff34
-JPEG_INCLUDE = -I/usr/local/include
-JPEG_LIB     = -L/usr/local/lib -ljpeg
-XPM_INCLUDE = -I/usr/X11R6/include/X11
-#endif
+TIFF_INCLUDE = -I@LOCALBASE@/include
+TIFF_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff
+JPEG_INCLUDE = -I@LOCALBASE@/include
+JPEG_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ljpeg
+PNG_INCLUDE = -I@LOCALBASE@/include/png
+PNG_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -lpng -lz
+XPM_INCLUDE = -I@XPMDIR@/include/X11
Changes 2.7.8.1: * minor bugfixes (zoomed windows are now correctly initialized) Pkgsrc: * now installs correctly (not to /usr/X11R6) 2006-01-06 23:36:19 +01:00			$NetBSD: patch-af,v 1.13 2006/01/06 22:36:19 adam Exp $
Split two patches into seperate files. 1999-05-09 20:47:22 +02:00
Changes 2.7.8.1: * minor bugfixes (zoomed windows are now correctly initialized) Pkgsrc: * now installs correctly (not to /usr/X11R6) 2006-01-06 23:36:19 +01:00			`--- Local.config.orig 2005-04-30 23:33:14.000000000 +0200`
Changes 2.7.2: * Added .bmp format * Support for .ico format with 24 and 32 bits per pixel * Now opens a confirmation dialog in case a file is going to be overwritten * Improved printer management 2004-11-03 16:54:31 +01:00			`+++ Local.config`
Changes 2.7.8.1: * minor bugfixes (zoomed windows are now correctly initialized) Pkgsrc: * now installs correctly (not to /usr/X11R6) 2006-01-06 23:36:19 +01:00			`@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2`
Update "xpaint" package to version 2.6.7. This version fixes several bugs found since version 2.6.2, adds several new features including french language support and has a Xaw95 based user interface. 2002-12-16 10:29:12 +01:00			`XCOMM Local customization`
Changes: * iprocess.c: added * graphics.c: implemented new "memory" widget * bug-fixes (image corruption in PNG; Xaw95; scrollbar) * PaintRegion.c: added rounding procedure in multiplication of matrices mm() 2003-07-17 11:01:01 +02:00
			`DESTDIR =`
Update "xpaint" package to version 2.6.7. This version fixes several bugs found since version 2.6.2, adds several new features including french language support and has a Xaw95 based user interface. 2002-12-16 10:29:12 +01:00			`-SHAREDIR = /usr/share/xpaint`
Changes 2.7.8: * Bug fixes Pkgsrc: * Use Xaw3d from now on (which is the recommended way) 2005-09-06 16:53:36 +02:00			`+SHAREDIR = @PREFIX@/share/xpaint`
Changes: * iprocess.c: added * graphics.c: implemented new "memory" widget * bug-fixes (image corruption in PNG; Xaw95; scrollbar) * PaintRegion.c: added rounding procedure in multiplication of matrices mm() 2003-07-17 11:01:01 +02:00
Changes 2.7.2: * Added .bmp format * Support for .ico format with 24 and 32 bits per pixel * Now opens a confirmation dialog in case a file is going to be overwritten * Improved printer management 2004-11-03 16:54:31 +01:00			`XCOMM Printing system defaults`
			`PRINT_COMMAND = lpr`
			`@@ -70,6 +70,9 @@ XCOMM #endif`
Turn of optimization on "arm32" until egcs gets fixed. 1999-05-09 22:08:15 +02:00
			`#ifdef NetBSDArchitecture`
			`ARCH_DEFINES = -DHAVE_PARAM_H`
			`+#ifdef arm32Architecture`
			`+CDEBUGFLAGS =`
Remove a NetBSD-specific check, all systems use ${LOCALBASE} in pkgsrc world. 2002-10-26 21:43:45 +02:00			`+#endif`
Update "xpaint" package to version 2.6.7. This version fixes several bugs found since version 2.6.2, adds several new features including french language support and has a Xaw95 based user interface. 2002-12-16 10:29:12 +01:00			`#endif`
Turn of optimization on "arm32" until egcs gets fixed. 1999-05-09 22:08:15 +02:00
			`#ifdef OS2Architecture`
Changes 2.7.2: * Added .bmp format * Support for .ico format with 24 and 32 bits per pixel * Now opens a confirmation dialog in case a file is going to be overwritten * Improved printer management 2004-11-03 16:54:31 +01:00			`@@ -132,11 +135,11 @@ XCOMM`
Fix for xpkgwedge Code by Alistair Crooks <agc@netbsd.org> 2000-09-01 15:43:37 +02:00			`XCOMM You must have the XPM library.`
			`XCOMM Make sure the path name to the library is correct.`

			`-XPM_LIB = -L/usr/X11R6/lib -lXpm`
Changes 2.7.8: * Bug fixes Pkgsrc: * Use Xaw3d from now on (which is the recommended way) 2005-09-06 16:53:36 +02:00			`+XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm`
Fix for xpkgwedge Code by Alistair Crooks <agc@netbsd.org> 2000-09-01 15:43:37 +02:00
			`XCOMM Make sure this points to the location of the 'xpm.h' file.`

			`-XPM_INCLUDE = -I/usr/X11R6/include/X11`
Changes 2.7.8: * Bug fixes Pkgsrc: * Use Xaw3d from now on (which is the recommended way) 2005-09-06 16:53:36 +02:00			`+XPM_INCLUDE = -I@XPMDIR@/include/X11`
Fix for xpkgwedge Code by Alistair Crooks <agc@netbsd.org> 2000-09-01 15:43:37 +02:00

			`DEPENDFLAGS = -I./bitmaps`
Fix buildling on DragonflyBSD and FreeBSD; courtesy of Steve O'Hara-Smith 2005-09-07 16:10:16 +02:00			`@@ -162,20 +165,11 @@ XCOMM CDEBUGFLAGS =`
Remove a NetBSD-specific check, all systems use ${LOCALBASE} in pkgsrc world. 2002-10-26 21:43:45 +02:00
			`XCOMM This should take care of everything needed for BSD.`
Turn of optimization on "arm32" until egcs gets fixed. 1999-05-09 22:08:15 +02:00
Remove a NetBSD-specific check, all systems use ${LOCALBASE} in pkgsrc world. 2002-10-26 21:43:45 +02:00			`-#if defined(NetBSDArchitecture) \|\| defined(BSD386Architecture)`
Split two patches into seperate files. 1999-05-09 20:47:22 +02:00			`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`
Remove a NetBSD-specific check, all systems use ${LOCALBASE} in pkgsrc world. 2002-10-26 21:43:45 +02:00			`-#endif`
Fix buildling on DragonflyBSD and FreeBSD; courtesy of Steve O'Hara-Smith 2005-09-07 16:10:16 +02:00			`-`
			`-#if defined(FreeBSDArchitecture)`
			`-ARCH_DEFINES = -DHAVE_PARAM_H`
			`-TIFF_INCLUDE = -I/usr/local/include/tiff34`
			`-TIFF_LIB = -L/usr/local/lib -ltiff34`
			`-JPEG_INCLUDE = -I/usr/local/include`
			`-JPEG_LIB = -L/usr/local/lib -ljpeg`
			`-XPM_INCLUDE = -I/usr/X11R6/include/X11`
			`-#endif`
Changes 2.7.8: * Bug fixes Pkgsrc: * Use Xaw3d from now on (which is the recommended way) 2005-09-06 16:53:36 +02:00			`+TIFF_INCLUDE = -I@LOCALBASE@/include`
			`+TIFF_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff`
			`+JPEG_INCLUDE = -I@LOCALBASE@/include`
			`+JPEG_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ljpeg`
			`+PNG_INCLUDE = -I@LOCALBASE@/include/png`
			`+PNG_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -lpng -lz`
			`+XPM_INCLUDE = -I@XPMDIR@/include/X11`