Simplify imake package doing the following changes:

	o Use IMAKE_* variables defined in defs.${OPSYS}.mk for the
	  manpages.
	o Disable compression of manual pages in FreeBSD.

7 files changed, 44 insertions, 46 deletions

diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index 89520783644..b3bc0e1d6fb 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/24 09:12:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/31 14:38:15 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	imake-${XF_VER}
@@ -11,13 +11,21 @@ HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	Imake and other utilities from XFree86
 
 USE_BUILDLINK2=	YES
-
 INSTALL_TARGET=	install install.man
 
 NO_XFREE86_TARGETS=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SUBST+=	IMAKE_MAN_DIR=${IMAKE_MAN_DIR}
+PLIST_SUBST+=	IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX}
+
+.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
+PLIST_SUBST+=	AVAILABLE=
+.else
+PLIST_SUBST+=	AVAILABLE="@comment "
+.endif
+
 .if ${OPSYS} == "Linux"
 DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	flex-[0-9]*:../../devel/flex
diff --git a/x11/imake/PLIST.common b/x11/imake/PLIST
index 3f5322c87ef..468bbb02b8d 100644
--- a/x11/imake/PLIST.common
+++ b/x11/imake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/24 08:43:26 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/01/31 14:38:15 xtraeme Exp $
 bin/ccmakedep
 bin/cleanlinks
 bin/gccmakedep
@@ -119,4 +119,19 @@ lib/X11/config/xf86.rules
 lib/X11/config/xf86.tmpl
 lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
+${AVAILABLE}${IMAKE_MAN_DIR}/ccmakedep.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/cleanlinks.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/gccmakedep.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/imake.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/lndir.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/makedepend.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/makeg.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/makestrs.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/mergelib.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/mkdirhier.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/mkhtmlindex.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/pswrap.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/revpath.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/rman.${IMAKE_MAN_SUFFIX}
+${AVAILABLE}${IMAKE_MAN_DIR}/xmkmf.${IMAKE_MAN_SUFFIX}
 @dirrm lib/X11/config
diff --git a/x11/imake/PLIST.FreeBSD b/x11/imake/PLIST.FreeBSD
deleted file mode 100644
index 7f899dcc8f5..00000000000
--- a/x11/imake/PLIST.FreeBSD
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
-man/man1/ccmakedep.1.gz
-man/man1/cleanlinks.1.gz
-man/man1/gccmakedep.1.gz
-man/man1/imake.1.gz
-man/man1/lndir.1.gz
-man/man1/makedepend.1.gz
-man/man1/makeg.1.gz
-man/man1/makestrs.1.gz
-man/man1/mergelib.1.gz
-man/man1/mkdirhier.1.gz
-man/man1/mkhtmlindex.1.gz
-man/man1/pswrap.1.gz
-man/man1/revpath.1.gz
-man/man1/rman.1.gz
-man/man1/xmkmf.1.gz
diff --git a/x11/imake/PLIST.Linux b/x11/imake/PLIST.Linux
deleted file mode 100644
index c475cc1d2d2..00000000000
--- a/x11/imake/PLIST.Linux
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/01/24 08:43:25 xtraeme Exp $
-man/man1/ccmakedep.1x
-man/man1/cleanlinks.1x
-man/man1/gccmakedep.1x
-man/man1/imake.1x
-man/man1/lndir.1x
-man/man1/makedepend.1x
-man/man1/makeg.1x
-man/man1/makestrs.1x
-man/man1/mergelib.1x
-man/man1/mkdirhier.1x
-man/man1/mkhtmlindex.1x
-man/man1/pswrap.1x
-man/man1/revpath.1x
-man/man1/rman.1x
-man/man1/xmkmf.1x
diff --git a/x11/imake/PLIST.NetBSD b/x11/imake/PLIST.NetBSD
deleted file mode 100644
index 4055289f8f6..00000000000
--- a/x11/imake/PLIST.NetBSD
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
-man/cat1/imake.0
diff --git a/x11/imake/distinfo b/x11/imake/distinfo
index c8fde85cb48..9520c76135e 100644
--- a/x11/imake/distinfo
+++ b/x11/imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/24 08:43:26 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/01/31 14:38:15 xtraeme Exp $
 
 SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b
 Size (X430src-1.tgz) = 10993622 bytes
@@ -6,7 +6,7 @@ SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66
 Size (X430src-3.tgz) = 12366363 bytes
 SHA1 (patch-aa) = 554472267b9a5bc6614b11c6688325c1fd7ffc0e
 SHA1 (patch-ab) = f9da29ae63b2adc563df4230ce8daa9fc75ad8ca
-SHA1 (patch-ac) = 103e9e0400dd5a25738065cf1bb3c34e3b65f8b1
+SHA1 (patch-ac) = 77568c9cddca68e910e6db8d6d7baa5e495a0fb5
 SHA1 (patch-ad) = dc2cd430ed18f950e32e55a262de845e905199ad
 SHA1 (patch-ae) = 8a2032645c204d07ed9a7d501fc929ebe022d741
 SHA1 (patch-af) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
diff --git a/x11/imake/patches/patch-ac b/x11/imake/patches/patch-ac
index cd6c5eb981a..2a50ba5c0bf 100644
--- a/x11/imake/patches/patch-ac
+++ b/x11/imake/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2004/01/31 14:38:15 xtraeme Exp $
 
---- config/cf/FreeBSD.cf.in.orig	2003-07-21 09:25:49.000000000 +0000
-+++ config/cf/FreeBSD.cf.in	2003-07-21 09:28:10.000000000 +0000
+--- config/cf/FreeBSD.cf.in.orig	Sat Jan 31 15:05:04 2004
++++ config/cf/FreeBSD.cf.in	Sat Jan 31 15:07:28 2004
 @@ -161,15 +161,10 @@
   *
   *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
@@ -13,8 +13,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
 -# define CcCmd			cc
 -# define CplusplusCmd		c++
 -#endif
-+# define CcCmd			@@PKGSRC_CC@@
-+# define CplusplusCmd		@@PKGSRC_CXX@@
++#define CcCmd			@@PKGSRC_CC@@
++#define CplusplusCmd		@@PKGSRC_CXX@@
  
 -#define CppCmd			/usr/bin/cpp
 +#define CppCmd			@@PKGSRC_CPP@@
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
  #define DefaultCCOptions	/**/
  #else
 -#define DefaultCCOptions	-ansi -pedantic -Dasm=__asm GccWarningOptions
-+#define DefaultCCOptions	-ansi -Dasm=__asm GccWarningOptions
++#define DefaultCCOptions	-ansi -Dasm=__asm
  #endif
  #endif
  #ifndef ExtraLibraries
@@ -47,7 +47,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
 -# define OptimizedCDebugFlags -O
 -#endif
 +#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
++#define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
  
  #ifndef PreIncDir
  # define PreIncDir	/usr/include
+@@ -519,7 +505,7 @@
+  * Compress manual pages
+  */
+ #ifndef CompressManPages
+-# define CompressManPages	YES
++# define CompressManPages	NO
+ #endif
+ 
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)