diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2010-12-28 22:31:32 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2010-12-28 22:31:32 +0000 |
| commit | 4ab798c7498a9cc15218d8504e4b58fbfe1a279c (patch) | |
| tree | 577ee4d34840867b604c51f46f63232576ccd6bf /graphics/xpaint | |
| parent | 6f7ea3982ee8685e15a5c250b18461f63cf1c52c (diff) | |
Update xpaint to 2.9.8.1
Notes
Notes:
svn path=/head/; revision=267094
Diffstat (limited to 'graphics/xpaint')
| -rw-r--r-- | graphics/xpaint/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xpaint/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xpaint/files/patch-Local.config | 46 |
3 files changed, 35 insertions, 19 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 2e7299ef2058..2d8be59b4429 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -6,9 +6,9 @@ # PORTNAME= xpaint -PORTVERSION= 2.9.8 +PORTVERSION= 2.9.8.1 CATEGORIES= graphics -MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= johans@FreeBSD.org COMMENT= A simple paint program diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo index 288a0a18bd33..7abcb623f899 100644 --- a/graphics/xpaint/distinfo +++ b/graphics/xpaint/distinfo @@ -1,2 +1,2 @@ -SHA256 (xpaint-2.9.8.tar.bz2) = c897d15c67c18c9522649a53c165392fbeda999fbbda518a2fe850a639e31054 -SIZE (xpaint-2.9.8.tar.bz2) = 1102930 +SHA256 (xpaint-2.9.8.1.tar.bz2) = 899fe36479a1414b1eabadbc6057e9864c134cc8961067099120ec22a1391bc9 +SIZE (xpaint-2.9.8.1.tar.bz2) = 1105057 diff --git a/graphics/xpaint/files/patch-Local.config b/graphics/xpaint/files/patch-Local.config index fca8d3ec8c3b..5222c5f238b8 100644 --- a/graphics/xpaint/files/patch-Local.config +++ b/graphics/xpaint/files/patch-Local.config @@ -1,22 +1,23 @@ ---- Local.config.orig 2010-02-23 23:11:07.000000000 +0900 -+++ Local.config 2010-06-24 05:20:52.000000000 +0900 -@@ -20,9 +20,8 @@ +--- Local.config.orig 2010-11-07 22:32:05.000000000 +0100 ++++ Local.config 2010-12-28 19:07:55.000000000 +0100 +@@ -20,9 +20,8 @@ XCOMM instead PRINTCAP (or disable it as LPCCMD = /usr/sbin/lpc status #define LPCCMD -#if defined(__NetBSD__) || defined(__FreeBSD) -+#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) - SHAREDIR = @PREFIX@/share/xpaint +-SHAREDIR = @PREFIX@/share/xpaint -LPCCMD = @PREFIX@/sbin/lpc status ++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) ++SHAREDIR = /usr/local/share/xpaint #endif XCOMM Enable/disable PRINTCAP (for BSD style printing configuration) -@@ -138,13 +137,13 @@ +@@ -174,22 +173,22 @@ XCOMM #define XawClientLibs -lXaw -Bstat XCOMM XCOMM You must have the freetype2 library. -XFT_INCLUDE = -I/usr/include/freetype2 --XFT_LIB = -lXft +-XFT_LIB = -lXft -lfontconfig +XFT_INCLUDE = -I. `pkg-config --cflags xft` +XFT_LIB = `pkg-config --libs xft` @@ -24,25 +25,40 @@ XCOMM Make sure the path name to the library is correct. -#if defined(__NetBSD__) || defined(__FreeBSD) +-XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm -lX11 -lm -lXmu -lXext +#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) - XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm -lX11 -lm -lXmu -lXext ++XPM_LIB = -L/usr/local/lib -Wl,-R/usr/local/lib -lXpm -lX11 -lm -lXmu -lXext #else - XPM_LIB = -L/usr/lib -Wl,-R/usr/lib -lXpm -lX11 -lm -lXmu -lXext -@@ -152,7 +151,7 @@ + XPM_LIB = -L/usr/lib -lXpm -lX11 -lm -lXmu -lXext + #endif XCOMM Make sure this points to the location of the 'xpm.h' file. -#if defined(__NetBSD__) || defined(__FreeBSD) +-XPM_INCLUDE = -I@XPMDIR@/include/X11 +#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) - XPM_INCLUDE = -I@XPMDIR@/include/X11 ++XPM_INCLUDE = -I/usr/local/include/X11 #else XPM_INCLUDE = -I/usr/include/X11 -@@ -182,7 +181,7 @@ + #endif +@@ -218,12 +217,12 @@ XCOMM CDEBUGFLAGS = XCOMM This should take care of everything needed for BSD. -#if defined(__NetBSD__) || defined(__FreeBSD__) +-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 +#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) - TIFF_INCLUDE = -I@LOCALBASE@/include - TIFF_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff - JPEG_INCLUDE = -I@LOCALBASE@/include ++TIFF_INCLUDE = -I/usr/local/include ++TIFF_LIB = -L/usr/local/lib -Wl,-R/usr/local/lib -ltiff ++JPEG_INCLUDE = -I/usr/local/include ++JPEG_LIB = -L/usr/local/lib -Wl,-R/usr/local/lib -ljpeg ++PNG_INCLUDE = -I/usr/local/include/png ++PNG_LIB = -L/usr/local/lib -Wl,-R/usr/local/lib -lpng -lz ++XPM_INCLUDE = -I/usr/local/include/X11 + #endif |