diff options
| -rw-r--r-- | graphics/xpm/Makefile | 9 | ||||
| -rw-r--r-- | graphics/xpm/files/md5 | 2 | ||||
| -rw-r--r-- | graphics/xpm/patches/patch-aa | 32 | ||||
| -rw-r--r-- | graphics/xpm/pkg/PLIST | 6 |
4 files changed, 18 insertions, 31 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index c2f505647cf..482b3345a5b 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.9 1998/06/22 12:39:48 agc Exp $ -# FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:45 max Exp +# $NetBSD: Makefile,v 1.10 1998/07/04 09:14:52 mycroft Exp $ # -DISTNAME= xpm-3.4j +DISTNAME= xpm-3.4k CATEGORIES= graphics x11 MASTER_SITES= ftp://avahi.inria.fr/pub/xpm/ -MAINTAINER= packages@netbsd.org +MAINTAINER= mycroft@netbsd.org + +CONFLICTS= xpm-3.4j USE_IMAKE= yes diff --git a/graphics/xpm/files/md5 b/graphics/xpm/files/md5 index 4fe10818204..deae3eeab47 100644 --- a/graphics/xpm/files/md5 +++ b/graphics/xpm/files/md5 @@ -1 +1 @@ -MD5 (xpm-3.4j.tar.gz) = 34154abe8b359d6892a815627c286dbf +MD5 (xpm-3.4k.tar.gz) = dd7c6df259912646671ab8cbd3fcafd7 diff --git a/graphics/xpm/patches/patch-aa b/graphics/xpm/patches/patch-aa index dd68266684b..b186f9196db 100644 --- a/graphics/xpm/patches/patch-aa +++ b/graphics/xpm/patches/patch-aa @@ -1,26 +1,10 @@ ---- lib/Imakefile 1997/11/06 11:09:44 1.1 -+++ lib/Imakefile 1997/11/06 11:10:29 -@@ -34,8 +34,12 @@ - #define XpmLibDir $(USRLIBDIR) - #endif - #ifndef XpmIncDir -+#if defined(NetBSDArchitecture) -+#define XpmIncDir $(INCROOT) -+#else - #define XpmIncDir $(INCDIR) - #endif -+#endif +--- Imakefile.orig Thu Mar 19 14:50:59 1998 ++++ Imakefile Sat Jul 4 05:08:45 1998 +@@ -59,6 +59,7 @@ - XCOMM If not already set in top dir, - XCOMM you can uncomment the following line to avoid building the shared lib -@@ -44,6 +48,10 @@ - #ifndef SharedLibXpm - # define SharedLibXpm (HasSharedLibraries && \ - !(defined(SGIArchitecture) && !SystemV4)) -+#endif -+ -+#if defined(NetBSDArchitecture) -+#define NormalLibXpm 1 - #endif + XCOMM You can uncomment the following line to avoid building the shared lib + XCOMM IMAKE_DEFINES = -DSharedLibXpm=NO ++IMAKE_DEFINES = -DForceNormalLib=YES - #ifndef NormalLibXpm + + XCOMM diff --git a/graphics/xpm/pkg/PLIST b/graphics/xpm/pkg/PLIST index e7824c4a6b9..6c1733922c1 100644 --- a/graphics/xpm/pkg/PLIST +++ b/graphics/xpm/pkg/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.7 1998/02/02 09:00:14 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.8 1998/07/04 09:14:54 mycroft Exp $ +bin/cxpm bin/sxpm lib/libXpm.a -lib/libXpm.so.4.10 +lib/libXpm.so.4.11 @exec /sbin/ldconfig || /usr/bin/true @unexec /sbin/ldconfig || /usr/bin/true include/X11/xpm.h +man/cat1/cxpm.0.gz man/cat1/sxpm.0.gz |