diff options
| author | tron <tron@pkgsrc.org> | 2001-07-06 21:11:33 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-07-06 21:11:33 +0000 |
| commit | ffac0bf19886db13d33ce097c0cb1763a125740c (patch) | |
| tree | 9761bc00c0f7635f392853cd3eff6910b7e11be3 /graphics | |
| parent | 8f157753f25762689604067b93b438b2f4eac7ff (diff) | |
| download | pkgsrc-ffac0bf19886db13d33ce097c0cb1763a125740c.tar.gz | |
Install "Xpm.h" to "include/X11" instead of "include/X11/X11" under
OpenWindows to avoid build lossage in several packages.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/xpm/Makefile | 8 | ||||
| -rw-r--r-- | graphics/xpm/buildlink.mk | 3 | ||||
| -rw-r--r-- | graphics/xpm/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xpm/patches/patch-ac | 15 | ||||
| -rw-r--r-- | graphics/xpm/pkg/PLIST | 4 |
5 files changed, 18 insertions, 16 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 50db8e8a0e4..480b9fe79b2 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/07/02 08:02:34 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/07/06 21:11:33 tron Exp $ DISTNAME= xpm-3.4k CATEGORIES= graphics x11 @@ -24,10 +24,4 @@ post-install: ${LN} -f libXpm.so.4.11 libXpm.so.4 .endif -.if defined(HAVE_OPENWINDOWS) -PLIST_SUBST+= INCDIR=include/X11/X11 -.else -PLIST_SUBST+= INCDIR=include/X11 -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk index 2fa947d92be..dae100334d0 100644 --- a/graphics/xpm/buildlink.mk +++ b/graphics/xpm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/02 14:16:55 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/06 21:11:33 tron Exp $ # # This Makefile fragment is included by packages that use xpm. # @@ -39,7 +39,6 @@ BUILDLINK_PREFIX.xpm= ${X11PREFIX} BUILDLINK_PREFIX.xpm= ${X11BASE} .endif -BUILDLINK_FILES.xpm= include/X11/X11/xpm.h # for OpenWindows BUILDLINK_FILES.xpm+= include/X11/xpm.h BUILDLINK_FILES.xpm+= lib/libXpm.* diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo index 2174fec926e..bd2006162f0 100644 --- a/graphics/xpm/distinfo +++ b/graphics/xpm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/06/09 11:41:36 tron Exp $ +$NetBSD: distinfo,v 1.5 2001/07/06 21:11:33 tron Exp $ SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd Size (xpm-3.4k.tar.gz) = 148887 bytes SHA1 (patch-aa) = 86264a0d832382eef43af740f16bcdf9448f4573 SHA1 (patch-ab) = 0c8f317cdbde27929790e46d1711ada5e454b79d -SHA1 (patch-ac) = 7c64179038a819bd21b0571a7f923cea96cf0afe +SHA1 (patch-ac) = a0f1692ecfbf0160f5e5a5e3f31ac9398ff667b7 diff --git a/graphics/xpm/patches/patch-ac b/graphics/xpm/patches/patch-ac index 73e6bad63d8..6434d9a9821 100644 --- a/graphics/xpm/patches/patch-ac +++ b/graphics/xpm/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.1 1999/10/31 10:46:31 mrg Exp $ +$NetBSD: patch-ac,v 1.2 2001/07/06 21:11:34 tron Exp $ ---- lib/Imakefile.orig Fri Mar 20 06:50:59 1998 -+++ lib/Imakefile Sun Oct 31 21:39:04 1999 +--- lib/Imakefile.orig Thu Mar 19 20:50:59 1998 ++++ lib/Imakefile Fri Jul 6 23:02:49 2001 +@@ -34,7 +34,7 @@ + #define XpmLibDir $(USRLIBDIR) + #endif + #ifndef XpmIncDir +-#define XpmIncDir $(INCDIR) ++#define XpmIncDir $(PROJECTROOT)/include + #endif + + XCOMM If not already set in top dir, @@ -55,7 +55,7 @@ #endif diff --git a/graphics/xpm/pkg/PLIST b/graphics/xpm/pkg/PLIST index 6031716b2b1..24837c0b7a0 100644 --- a/graphics/xpm/pkg/PLIST +++ b/graphics/xpm/pkg/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.11 2001/06/08 21:30:36 tron Exp $ +@comment $NetBSD: PLIST,v 1.12 2001/07/06 21:11:34 tron Exp $ bin/cxpm bin/sxpm lib/libXpm.a lib/libXpm.so lib/libXpm.so.4 lib/libXpm.so.4.11 -${INCDIR}/xpm.h +include/X11/xpm.h man/cat1/cxpm.0.gz man/cat1/sxpm.0.gz |