diff options
author | obache <obache@pkgsrc.org> | 2008-11-30 08:43:16 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2008-11-30 08:43:16 +0000 |
commit | dca0625c6bf96ac928483683443d51f94d7a63ec (patch) | |
tree | 3980d2685c5e13a2c40469c6392cce302304c6fe /graphics | |
parent | 13ad1a8f4bdc5041b10dfb443983623cda15327b (diff) | |
download | pkgsrc-dca0625c6bf96ac928483683443d51f94d7a63ec.tar.gz |
Various fixes:
* Remove copy of X11 header files for old X11,
it may cause build failure with recent X, like a PR 39975.
* Need rgb.txt, add dependency on x11/rgb for X11_TYPE=modular.
And fix path for the file (SUBST.rgb and patch-ac).
* Add DESTDIR support. it seems that rules of imake deal spaces after cammna
as part of the argument (patch-ac).
* Replace IMAKE_MANNEWSUFFIX with IMAKE_MAN_SUFFIX in PLIST.
* hard coded errno and sys_errlist is not portable these days (patch-ab)
* sort PLIST
* regen patches with unfied diff.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/pixmap/Makefile | 27 | ||||
-rw-r--r-- | graphics/pixmap/PLIST | 8 | ||||
-rw-r--r-- | graphics/pixmap/distinfo | 8 | ||||
-rw-r--r-- | graphics/pixmap/patches/patch-aa | 32 | ||||
-rw-r--r-- | graphics/pixmap/patches/patch-ab | 34 | ||||
-rw-r--r-- | graphics/pixmap/patches/patch-ac | 23 |
6 files changed, 74 insertions, 58 deletions
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 430f1116e3e..38a3f0a60ab 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2008/11/30 08:43:16 obache Exp $ DISTNAME= pixmap2.6 PKGNAME= pixmap-2.6.4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/pixmap/} @@ -15,11 +15,30 @@ PATCHFILES= pixmap_2.6.patch1.gz \ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Pixmap editor based on XPM library +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= YES -MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:M*:Q} -MAKE_ENV+= MOTIFBASE=${MOTIFBASE:Q} +MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:Q} +MAKE_ENV+= MOTIFBASE=${MOTIFBASE} + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "modular" +DEPENDS+= rgb>=1.0.1:../../x11/rgb +RGBTXT= ${PREFIX}/share/X11/rgb.txt +.else +RGBTXT= ${X11BASE}/lib/X11/rgb.txt +.endif + +SUBST_CLASSES+= rgb +SUBST_STAGE.rgb= pre-configure +SUBST_FILES.rgb= Imakefile +SUBST_VARS.rgb= RGBTXT + +post-extract: + rm -rf ${WRKSRC}/X11 .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/graphics/pixmap/PLIST b/graphics/pixmap/PLIST index 6cf6a004388..ad779b976fe 100644 --- a/graphics/pixmap/PLIST +++ b/graphics/pixmap/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2003/03/02 19:47:24 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/11/30 08:43:16 obache Exp $ bin/pixmap -lib/X11/app-defaults/Pixmap lib/X11/Pixmap/MDown lib/X11/Pixmap/MFlipHoriz lib/X11/Pixmap/MFlipVert @@ -9,6 +8,7 @@ lib/X11/Pixmap/MLeft lib/X11/Pixmap/MRight lib/X11/Pixmap/MRotateLeft lib/X11/Pixmap/MRotateRight -lib/X11/Pixmap/Stipple lib/X11/Pixmap/MUp -${IMAKE_MAN_DIR}/pixmap.${IMAKE_MANNEWSUFFIX} +lib/X11/Pixmap/Stipple +lib/X11/app-defaults/Pixmap +${IMAKE_MAN_DIR}/pixmap.${IMAKE_MAN_SUFFIX} diff --git a/graphics/pixmap/distinfo b/graphics/pixmap/distinfo index bd9c68aed8e..0f7a45e5254 100644 --- a/graphics/pixmap/distinfo +++ b/graphics/pixmap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 08:45:11 agc Exp $ +$NetBSD: distinfo,v 1.7 2008/11/30 08:43:16 obache Exp $ SHA1 (pixmap2.6.tar.gz) = f9b0c610ed73254fbde9a25346ed78d493d97752 RMD160 (pixmap2.6.tar.gz) = 862bf8a40c95e410035243c5bbd75df8d5c7e617 @@ -15,6 +15,6 @@ Size (pixmap_2.6.patch3.gz) = 10208 bytes SHA1 (pixmap_2.6.patch4.gz) = 1a994cdbe837ac36d0cb4d5c2109f18b5732d7b6 RMD160 (pixmap_2.6.patch4.gz) = 0f9c67cc6e2db6efe27b88d19640ebccde8e64fc Size (pixmap_2.6.patch4.gz) = 1269 bytes -SHA1 (patch-aa) = 83e783b4308374e638a5b129f219a2b45d93126e -SHA1 (patch-ab) = 67f64b30aa72d8a1fefe24d264c27d028cb8056b -SHA1 (patch-ac) = 501d8c73092abae755bdd33dba15dcec39784eb7 +SHA1 (patch-aa) = b51ced9659d8360f96d9434d670ad66016e81988 +SHA1 (patch-ab) = d7da0a7998bbac1e25763eea5a64afb79d98d1e6 +SHA1 (patch-ac) = c42f312a041693f2ab94ad7efbbaba7c91cf2c30 diff --git a/graphics/pixmap/patches/patch-aa b/graphics/pixmap/patches/patch-aa index 5841d875b91..f1c906970f6 100644 --- a/graphics/pixmap/patches/patch-aa +++ b/graphics/pixmap/patches/patch-aa @@ -1,21 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:52 agc Exp $ +$NetBSD: patch-aa,v 1.3 2008/11/30 08:43:16 obache Exp $ -*** Pixmap.h~ Fri May 13 04:03:29 1994 ---- Pixmap.h Sun Feb 19 03:35:48 1995 -*************** -*** 69,75 **** - #include <X11/Xmu/Converters.h> - #include <X11/Xos.h> - #include <X11/Xfuncproto.h> -! #include "xpm.h" - - /* Resources: - ---- 69,75 ---- - #include <X11/Xmu/Converters.h> - #include <X11/Xos.h> - #include <X11/Xfuncproto.h> -! #include <X11/xpm.h> - - /* Resources: - +--- Pixmap.h.orig 2008-11-30 06:21:45.000000000 +0000 ++++ Pixmap.h +@@ -69,7 +69,7 @@ + #include <X11/Xmu/Converters.h> + #include <X11/Xos.h> + #include <X11/Xfuncproto.h> +-#include "xpm.h" ++#include <X11/xpm.h> + + /* Resources: + diff --git a/graphics/pixmap/patches/patch-ab b/graphics/pixmap/patches/patch-ab index c5986260fb5..54f02ef80b6 100644 --- a/graphics/pixmap/patches/patch-ab +++ b/graphics/pixmap/patches/patch-ab @@ -1,21 +1,15 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:53 agc Exp $ +$NetBSD: patch-ab,v 1.3 2008/11/30 08:43:16 obache Exp $ -*** SelFile/SelFile.c~ Mon May 30 04:02:59 1994 ---- SelFile/SelFile.c Sun Feb 19 03:40:43 1995 -*************** -*** 46,52 **** - /* BSD 4.3 errno.h does not declare errno */ - extern int errno; - extern int sys_nerr; -! extern char *sys_errlist[]; - - #include <sys/param.h> - #include <X11/cursorfont.h> ---- 46,52 ---- - /* BSD 4.3 errno.h does not declare errno */ - extern int errno; - extern int sys_nerr; -! /* extern char *sys_errlist[];*/ - - #include <sys/param.h> - #include <X11/cursorfont.h> +--- SelFile/SelFile.c.orig 1993-12-27 12:14:20.000000000 +0000 ++++ SelFile/SelFile.c +@@ -43,10 +43,6 @@ + + #include <stdio.h> + #include <errno.h> +-/* BSD 4.3 errno.h does not declare errno */ +-extern int errno; +-extern int sys_nerr; +-extern char *sys_errlist[]; + + #include <sys/param.h> + #include <X11/cursorfont.h> diff --git a/graphics/pixmap/patches/patch-ac b/graphics/pixmap/patches/patch-ac index d4fda76fa66..b827cab397f 100644 --- a/graphics/pixmap/patches/patch-ac +++ b/graphics/pixmap/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2008/11/30 08:43:16 obache Exp $ ---- Imakefile.orig Fri May 13 06:04:38 1994 +--- Imakefile.orig 1994-05-13 11:04:38.000000000 +0000 +++ Imakefile -@@ -8,7 +8,7 @@ +@@ -8,7 +8,7 @@ XCOMM Created: April 20, 1991. XCOMM XCOMM def/undef USE_MOTIF there if you want Pixmap to use Motif or not. @@ -11,12 +11,12 @@ $NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $ #ifdef HPArchitecture CCOPTIONS = -Aa -D_HPUX_SOURCE -DNO_EDITRES #if ProjectX > 4 -@@ -21,22 +21,20 @@ +@@ -21,22 +21,20 @@ R5EXT = -I. #endif XCOMM Where you have rgb.txt -RGBTXT = $(LIBDIR)/rgb.txt -+RGBTXT = ${X11BASE}/lib/X11/rgb.txt ++RGBTXT = @RGBTXT@ XCOMM LUCS extra variable for where bitmaps go PIXMAPDIR = $(LIBDIR)/Pixmap @@ -39,7 +39,18 @@ $NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $ BITMAPS = MDown MFlipHoriz MFlipVert MFold MLeft MRight MRotateLeft \ MRotateRight Stipple MUp #else -@@ -89,7 +87,7 @@ +@@ -70,8 +68,8 @@ LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm + + ComplexProgramTarget(pixmap) + InstallAppDefaults(Pixmap) +-MakeDirectories(install, $(PIXMAPDIR)) +-InstallMultipleFlags($(BITMAPS), $(PIXMAPDIR), $(INSTDATFLAGS)) ++MakeDirectories(install,$(PIXMAPDIR)) ++InstallMultipleFlags($(BITMAPS),$(PIXMAPDIR),$(INSTDATFLAGS)) + + AllTarget(dotpixmap) + +@@ -89,7 +87,7 @@ NamedMakeSubdirs(Xgnu, SelFile) Pixmap.ad: APixmap.ad @echo Pixmap compiled with Athena. |