Made the package build with SunPro. Removed *.orig from the PLIST. Fixed

some pkglint warnings. Bumped PKGREVISION.

4 files changed, 39 insertions, 23 deletions

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 6988dafd3ac..c6068b1ed50 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/06/02 12:13:03 rillig Exp $
 
 DISTNAME=	xfig.3.2.5-alpha5.full
 PKGNAME=	xfig-3.2.5alpha5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://epb.lbl.gov/xfig/alpha/
 
@@ -25,29 +25,30 @@ CFLAGS+=		-I${X11PREFIX}/include/X11
 
 .include "../../mk/bsd.prefs.mk"
 
-pre-configure:
+post-extract:
+	cd ${WRKSRC} && ${RM} -f Doc/*.orig Doc/*/*.orig Doc/*/*/*.orig
+
+SUBST_CLASSES+=		xaw
+SUBST_STAGE.xaw=	post-configure
+SUBST_MESSAGE.xaw=	Fixing Imakefile
+SUBST_FILES.xaw=	IMakefile
 .if defined(XAW_TYPE) && ${XAW_TYPE} == "3d"
-	# define XAW3D and XAW3D1_5E
-	cd ${WRKSRC} &&	\
-	  if [ ! -f Imakefile.bak ]; then ${MV} Imakefile Imakefile.bak; fi && \
-	  ${SED} -e 's/.*\(#define.XAW3D\)/\1/' Imakefile.bak > Imakefile
+# define XAW3D and XAW3D1_5E
+SUBST_SED.xaw+=		-e 's/.*\(\#define.XAW3D\)/\1/'
 .elif defined(XAW_TYPE) && ${XAW_TYPE} == "xpm"
-	#  define XAW3D, undef XAW3D1_5E
-	cd ${WRKSRC} &&	\
-	  if [ ! -f Imakefile.bak ]; then ${MV} Imakefile Imakefile.bak; fi && \
-	  ${SED} -e 's/.*\(#define.XAW3D1_5E\)/XCOMM \1/' -e t \
-	  	 -e 's/.*\(#define.XAW3D\)/\1/' Imakefile.bak > Imakefile
+#  define XAW3D, undef XAW3D1_5E
+SUBST_SED.xaw+=		-e 's/.*\(\#define.XAW3D1_5E\)/XCOMM \1/'
+SUBST_SED.xaw+=		-e t
+SUBST_SED.xaw+=		-e 's/.*\(\#define.XAW3D\)/\1/'
 .else
-	# undef XAW3D and XAW3D1_5E
-	cd ${WRKSRC} &&	\
-	  if [ ! -f Imakefile.bak ]; then ${MV} Imakefile Imakefile.bak; fi && \
-	  ${SED} 's/.*\(#define.XAW3D\)/XCOMM \1/' Imakefile.bak > Imakefile
+# undef XAW3D and XAW3D1_5E
+SUBST_SED.xaw+=		-e 's/.*\(\#define.XAW3D\)/XCOMM \1/'
 .endif
 
 XFIGDOCDIR=		${PREFIX}/share/doc/xfig
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Doc/FORMAT* ${XFIGDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/Doc/FORMAT?.? ${XFIGDOCDIR}
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/xfig/PLIST b/graphics/xfig/PLIST
index d1254149c99..14145447b18 100644
--- a/graphics/xfig/PLIST
+++ b/graphics/xfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/02/04 13:17:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/02 12:13:03 rillig Exp $
 bin/xfig
 lib/X11/app-defaults/Fig
 lib/X11/app-defaults/Fig-color
@@ -2505,12 +2505,10 @@ share/doc/xfig/FORMAT2.1
 share/doc/xfig/FORMAT3.0
 share/doc/xfig/FORMAT3.1
 share/doc/xfig/FORMAT3.2
-share/doc/xfig/FORMAT3.2.orig
 share/doc/xfig/html/accelerators.html
 share/doc/xfig/html/animate.js
 share/doc/xfig/html/attributes.html
 share/doc/xfig/html/authors.html
-share/doc/xfig/html/authors.html.orig
 share/doc/xfig/html/bugs_fixed.3.2.1.html
 share/doc/xfig/html/bugs_fixed.3.2.2.html
 share/doc/xfig/html/bugs_fixed.3.2.3.html
@@ -2677,7 +2675,6 @@ share/doc/xfig/html/images/export-panel-jpeg.png
 share/doc/xfig/html/images/export-panel-postscript.png
 share/doc/xfig/html/images/export-panel.png
 share/doc/xfig/html/images/file-accel.png
-share/doc/xfig/html/images/file-accel.png.orig
 share/doc/xfig/html/images/file-menu-button.png
 share/doc/xfig/html/images/file-panel.png
 share/doc/xfig/html/images/fill-color-button.png
@@ -2814,7 +2811,6 @@ share/doc/xfig/html/images/vertical-align-edge-even.png
 share/doc/xfig/html/images/vertical-align-none.png
 share/doc/xfig/html/images/vertical-align-top.png
 share/doc/xfig/html/images/view-accel.png
-share/doc/xfig/html/images/view-accel.png.orig
 share/doc/xfig/html/images/view-menu-button.png
 share/doc/xfig/html/images/watch.png
 share/doc/xfig/html/images/watch_sm.png
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index cd3d0f6d48a..9caec77d323 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/02/04 13:17:51 markd Exp $
+$NetBSD: distinfo,v 1.15 2006/06/02 12:13:03 rillig Exp $
 
 SHA1 (xfig.3.2.5-alpha5.full.tar.gz) = ed99caf4505bc401ac34ecbe3d4c0aa783c4cc62
 RMD160 (xfig.3.2.5-alpha5.full.tar.gz) = 47fd9d74b117518d1870297228e31591f312df2d
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 3ff914bd2ca913f7c4e2ea2a648a0776cd5098bf
 SHA1 (patch-ab) = 7fb6cdf47d980db3d95cba0797408247087148e0
 SHA1 (patch-ac) = 63ac4774439cab4bda5c75a3912103080bc1c6fd
 SHA1 (patch-ad) = 80ae2ce2eea6a747862d1b223ffff56feaa73f1a
+SHA1 (patch-ae) = 91aaa109fb38429043be89c9224ad3ca8f7bc02f
diff --git a/graphics/xfig/patches/patch-ae b/graphics/xfig/patches/patch-ae
new file mode 100644
index 00000000000..e45188616a2
--- /dev/null
+++ b/graphics/xfig/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.3 2006/06/02 12:13:03 rillig Exp $
+
+SunPro does not understand __inline, only inline.
+
+--- fig.h.orig	2004-01-06 20:47:36.000000000 +0100
++++ fig.h	2006-06-02 12:41:17.122524864 +0200
+@@ -353,7 +353,11 @@ extern char *getenv();
+ #define		signof(a)	(((a) < 0) ? -1 : 1)
+ 
+ #ifdef USE_INLINE
++#  if defined(__SUNPRO_C)
++#    define INLINE inline
++#  else
+ #define INLINE __inline
++#  endif
+ #else
+ #define INLINE
+ #endif /* USE_INLINE */