- - Enable the Motif option, to link against "openmotif". Looks great!

- - Drop the dependency on "rman" -- don't need it.
- - Bump the version number to 2.6.4nb1.

4 files changed, 45 insertions, 26 deletions

diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 6b4ecf75f96..05274911283 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2002/01/09 02:37:47 fredb Exp $
 # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
 #
 
 DISTNAME=		pixmap2.6
-PKGNAME=		pixmap-2.6pl4
+PKGNAME=		pixmap-2.6.4nb1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/pixmap/}
+
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		pixmap_2.6.patch1.gz \
 			pixmap_2.6.patch2.gz \
@@ -15,10 +16,14 @@ PATCHFILES=		pixmap_2.6.patch1.gz \
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Pixmap editor based on XPM library
 
-USE_RMAN=		YES
 USE_IMAKE=		YES
-USE_XPM=		YES
+USE_MOTIF=		YES
 
 WRKSRC=			${WRKDIR}/pixmap
 
+MAKE_ENV+=		LOCAL_LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=		MOTIFBASE="${MOTIFBASE}"
+
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/motif.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pixmap/PLIST b/graphics/pixmap/PLIST
index 714fbe811fd..5b0b5fe8e4a 100644
--- a/graphics/pixmap/PLIST
+++ b/graphics/pixmap/PLIST
@@ -1,17 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:55 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/09 02:37:47 fredb Exp $
 bin/pixmap
 lib/X11/app-defaults/Pixmap
-lib/X11/Pixmap/Down
-lib/X11/Pixmap/FlipHoriz
-lib/X11/Pixmap/FlipVert
-lib/X11/Pixmap/Fold
-lib/X11/Pixmap/Left
-lib/X11/Pixmap/Right
-lib/X11/Pixmap/RotateLeft
-lib/X11/Pixmap/RotateRight
+lib/X11/Pixmap/MDown
+lib/X11/Pixmap/MFlipHoriz
+lib/X11/Pixmap/MFlipVert
+lib/X11/Pixmap/MFold
+lib/X11/Pixmap/MLeft
+lib/X11/Pixmap/MRight
+lib/X11/Pixmap/MRotateLeft
+lib/X11/Pixmap/MRotateRight
 lib/X11/Pixmap/Stipple
-lib/X11/Pixmap/Up
-lib/X11/Pixmap/Term
-lib/X11/Pixmap/Excl
+lib/X11/Pixmap/MUp
 man/cat1/pixmap.0
-lib/libXgnu.a
diff --git a/graphics/pixmap/distinfo b/graphics/pixmap/distinfo
index 5ad4aface68..2dea299da15 100644
--- a/graphics/pixmap/distinfo
+++ b/graphics/pixmap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:23 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/01/09 02:37:47 fredb Exp $
 
 SHA1 (pixmap2.6.tar.gz) = f9b0c610ed73254fbde9a25346ed78d493d97752
 Size (pixmap2.6.tar.gz) = 120340 bytes
@@ -12,4 +12,4 @@ SHA1 (pixmap_2.6.patch4.gz) = 1a994cdbe837ac36d0cb4d5c2109f18b5732d7b6
 Size (pixmap_2.6.patch4.gz) = 1269 bytes
 SHA1 (patch-aa) = 83e783b4308374e638a5b129f219a2b45d93126e
 SHA1 (patch-ab) = 67f64b30aa72d8a1fefe24d264c27d028cb8056b
-SHA1 (patch-ac) = 5743e4b2322658d131e01d51c24c49f1ca0a01e3
+SHA1 (patch-ac) = 9c3102bd9239d96eab65b640170aef680b2dab27
diff --git a/graphics/pixmap/patches/patch-ac b/graphics/pixmap/patches/patch-ac
index 7698af7734d..faf02fe6c14 100644
--- a/graphics/pixmap/patches/patch-ac
+++ b/graphics/pixmap/patches/patch-ac
@@ -1,20 +1,37 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:53 agc Exp $
+$NetBSD: patch-ac,v 1.3 2002/01/09 02:37:47 fredb Exp $
 
---- ./Imakefile.org	Fri May 13 04:04:38 1994
-+++ ./Imakefile	Mon Feb 27 16:31:46 1995
-@@ -27,10 +27,9 @@
+--- Imakefile.orig	Fri May 13 06:04:38 1994
++++ Imakefile
+@@ -8,7 +8,7 @@
+ XCOMM
+ 
+ XCOMM def/undef USE_MOTIF there if you want Pixmap to use Motif or not.
+-#undef USE_MOTIF
++#define USE_MOTIF
+ #ifdef HPArchitecture
+ CCOPTIONS = -Aa -D_HPUX_SOURCE -DNO_EDITRES
+ #if ProjectX > 4
+@@ -27,16 +27,14 @@
  PIXMAPDIR = $(LIBDIR)/Pixmap
  
  XCOMM Specify here your Xpm installation directories
 -        XPM_INCLUDEDIR = /usr/local/include
-         XPM_LIBDIR = $(LIBDIR)/xpm
+-        XPM_LIBDIR = $(LIBDIR)/xpm
 -        XPM_INCLUDEDIR = /net/koala/include
 -        XPM_LIBDIR = /net/koala/lib/sun4
-+        XPM_INCLUDEDIR = $(INCDIR)
+-        EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER)
++        XPM_INCLUDEDIR = $(BUILDLINK_DIR)/include
 +        XPM_LIBDIR = $(USRLIBDIR)
-         EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER)
++        EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I$(MOTIFBASE)/include
  
  #ifdef USE_MOTIF
+ XCOMM Motif configuration
+   LOCAL_DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES) -D_NO_PROTO
+-LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm -L/usr/lib/$(MOTIFVER) -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
++LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm ${MOTIFLIB} -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
+         BITMAPS = MDown MFlipHoriz MFlipVert MFold  MLeft MRight MRotateLeft \
+                   MRotateRight Stipple MUp
+ #else
 @@ -89,7 +88,7 @@
  
  Pixmap.ad: APixmap.ad