diff options
Diffstat (limited to 'x11/imake')
| -rw-r--r-- | x11/imake/Makefile | 25 | ||||
| -rw-r--r-- | x11/imake/PLIST | 279 | ||||
| -rw-r--r-- | x11/imake/distinfo | 20 | ||||
| -rw-r--r-- | x11/imake/files/host.def | 9 | ||||
| -rw-r--r-- | x11/imake/patches/patch-ac | 72 | ||||
| -rw-r--r-- | x11/imake/patches/patch-ad | 77 | ||||
| -rw-r--r-- | x11/imake/patches/patch-ae | 71 | ||||
| -rw-r--r-- | x11/imake/patches/patch-af | 49 | ||||
| -rw-r--r-- | x11/imake/patches/patch-ag | 42 | ||||
| -rw-r--r-- | x11/imake/patches/patch-ah | 41 |
10 files changed, 280 insertions, 405 deletions
diff --git a/x11/imake/Makefile b/x11/imake/Makefile index 7ef18c6d233..daf78570bed 100644 --- a/x11/imake/Makefile +++ b/x11/imake/Makefile @@ -1,39 +1,29 @@ -# $NetBSD: Makefile,v 1.6 2004/02/02 19:10:05 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/28 22:06:16 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= imake-${XF_VER} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} -DISTFILES= X430src-1.tgz X430src-3.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-3.tgz MAINTAINER= xfree86@blef.org HOMEPAGE= http://www.xfree86.org/ COMMENT= Imake and other utilities from XFree86 -INSTALL_TARGET= install install.man +DEPENDS+= XFree86-dirs>=1.0:../../misc/XFree86-dirs -USE_BUILDLINK2= yes +USE_BUILDLINK3= 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_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX} - -.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 -USE_GNU_TOOLS+= make .endif -.include "../../meta-pkgs/XFree86/Makefile.common" +.include "../../XFree86/XFree86/Makefile.common" post-extract: .for F in ${SYSTEMS} @@ -58,10 +48,9 @@ do-build: @${TOUCH} ${WRKSRC}/config/cf/date.def @${CP} ${FILESDIR}/xf86site.def ${WRKSRC}/config/cf @${SED} \ - -e "s|@PREFIX@|${PREFIX}|g" \ + -e "s|@PREFIX@|${X11ROOT}|g" \ -e "s|@BLNK@|${BUILDLINK_DIR}|g" \ -e "s|@LOCALBASE@|${LOCALBASE}|g " \ - -e "s|@LDFLAGS@|${LDFLAGS}|g" \ -e "s|@MAKE@|${MAKE_PROGRAM}|" \ ${FILESDIR}/host.def > \ ${WRKSRC}/config/cf/host.def diff --git a/x11/imake/PLIST b/x11/imake/PLIST index 49dab425300..b65fcd5b52b 100644 --- a/x11/imake/PLIST +++ b/x11/imake/PLIST @@ -1,143 +1,136 @@ -@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:14:45 xtraeme Exp $ -X11R6/bin/ccmakedep -X11R6/bin/cleanlinks -X11R6/bin/gccmakedep -X11R6/bin/imake -X11R6/bin/lndir -X11R6/bin/makedepend -X11R6/bin/makeg -X11R6/bin/makestrs -X11R6/bin/mergelib -X11R6/bin/mkdirhier -X11R6/bin/mkhtmlindex -X11R6/bin/pswrap -X11R6/bin/revpath -X11R6/bin/rman -X11R6/bin/xmkmf -X11R6/lib/X11/config/Amoeba.cf -X11R6/lib/X11/config/DGUX.cf -X11R6/lib/X11/config/FreeBSD.cf -X11R6/lib/X11/config/Imake.cf -X11R6/lib/X11/config/Imake.rules -X11R6/lib/X11/config/Imake.tmpl -X11R6/lib/X11/config/Library.tmpl -X11R6/lib/X11/config/Mips.cf -X11R6/lib/X11/config/Motif.rules -X11R6/lib/X11/config/Motif.tmpl -X11R6/lib/X11/config/${OPSYS}.cf -X11R6/lib/X11/config/Oki.cf -X11R6/lib/X11/config/OpenBSD.cf -X11R6/lib/X11/config/QNX4.cf -X11R6/lib/X11/config/QNX4.rules -X11R6/lib/X11/config/Server.tmpl -X11R6/lib/X11/config/ServerLib.tmpl -X11R6/lib/X11/config/Threads.tmpl -X11R6/lib/X11/config/Win32.cf -X11R6/lib/X11/config/Win32.rules -X11R6/lib/X11/config/WinLib.tmpl -X11R6/lib/X11/config/X11.rules -X11R6/lib/X11/config/X11.tmpl -X11R6/lib/X11/config/apollo.cf -X11R6/lib/X11/config/bsd.cf -X11R6/lib/X11/config/bsdLib.rules -X11R6/lib/X11/config/bsdLib.tmpl -X11R6/lib/X11/config/bsdi.cf -X11R6/lib/X11/config/cde.rules -X11R6/lib/X11/config/cde.tmpl -X11R6/lib/X11/config/convex.cf -X11R6/lib/X11/config/cray.cf -X11R6/lib/X11/config/cygwin.cf -X11R6/lib/X11/config/cygwin.rules -X11R6/lib/X11/config/cygwin.tmpl -X11R6/lib/X11/config/darwin.cf -X11R6/lib/X11/config/darwinLib.rules -X11R6/lib/X11/config/darwinLib.tmpl -X11R6/lib/X11/config/date.def -X11R6/lib/X11/config/fujitsu.cf -X11R6/lib/X11/config/generic.cf -X11R6/lib/X11/config/gnu.cf -X11R6/lib/X11/config/gnuLib.rules -X11R6/lib/X11/config/gnuLib.tmpl -X11R6/lib/X11/config/host.def -X11R6/lib/X11/config/hp.cf -X11R6/lib/X11/config/hpLib.rules -X11R6/lib/X11/config/hpLib.tmpl -X11R6/lib/X11/config/ibm.cf -X11R6/lib/X11/config/ibmLib.rules -X11R6/lib/X11/config/ibmLib.tmpl -X11R6/lib/X11/config/isc.cf -X11R6/lib/X11/config/linux.cf -X11R6/lib/X11/config/lnxLib.rules -X11R6/lib/X11/config/lnxLib.tmpl -X11R6/lib/X11/config/lnxdoc.rules -X11R6/lib/X11/config/lnxdoc.tmpl -X11R6/lib/X11/config/luna.cf -X11R6/lib/X11/config/lynx.cf -X11R6/lib/X11/config/macII.cf -X11R6/lib/X11/config/mach.cf -X11R6/lib/X11/config/minix.cf -X11R6/lib/X11/config/moto.cf -X11R6/lib/X11/config/ncr.cf -X11R6/lib/X11/config/nec.cf -X11R6/lib/X11/config/necLib.rules -X11R6/lib/X11/config/necLib.tmpl -X11R6/lib/X11/config/noop.rules -X11R6/lib/X11/config/nto.cf -X11R6/lib/X11/config/nto.rules -X11R6/lib/X11/config/oldlib.rules -X11R6/lib/X11/config/os2.cf -X11R6/lib/X11/config/os2.rules -X11R6/lib/X11/config/os2Lib.rules -X11R6/lib/X11/config/os2Lib.tmpl -X11R6/lib/X11/config/osf1.cf -X11R6/lib/X11/config/osfLib.rules -X11R6/lib/X11/config/osfLib.tmpl -X11R6/lib/X11/config/pegasus.cf -X11R6/lib/X11/config/sco.cf -X11R6/lib/X11/config/sco5.cf -X11R6/lib/X11/config/scoLib.rules -X11R6/lib/X11/config/sequent.cf -X11R6/lib/X11/config/sgi.cf -X11R6/lib/X11/config/sgiLib.rules -X11R6/lib/X11/config/sgiLib.tmpl -X11R6/lib/X11/config/site.def -X11R6/lib/X11/config/sony.cf -X11R6/lib/X11/config/sun.cf -X11R6/lib/X11/config/sunLib.rules -X11R6/lib/X11/config/sunLib.tmpl -X11R6/lib/X11/config/sv3Lib.rules -X11R6/lib/X11/config/sv3Lib.tmpl -X11R6/lib/X11/config/sv4Lib.rules -X11R6/lib/X11/config/sv4Lib.tmpl -X11R6/lib/X11/config/svr3.cf -X11R6/lib/X11/config/svr4.cf -X11R6/lib/X11/config/ultrix.cf -X11R6/lib/X11/config/usl.cf -X11R6/lib/X11/config/version.def -X11R6/lib/X11/config/x386.cf -X11R6/lib/X11/config/xf86.rules -X11R6/lib/X11/config/xf86.tmpl -X11R6/lib/X11/config/xf86site.def -X11R6/lib/X11/config/xfree86.cf -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/ccmakedep.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/cleanlinks.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/gccmakedep.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/imake.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/lndir.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makedepend.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makeg.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makestrs.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mergelib.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mkdirhier.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mkhtmlindex.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/pswrap.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/revpath.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/rman.${IMAKE_MANNEWSUFFIX} -${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/xmkmf.${IMAKE_MANNEWSUFFIX} -@dirrm X11R6/bin -@dirrm X11R6/${IMAKE_MAN_DIR} -@dirrm X11R6/man -@dirrm X11R6/lib/X11/config -@dirrm X11R6/lib/X11 -@dirrm X11R6/lib -@dirrm X11R6 +@comment $NetBSD: PLIST,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/ccmakedep +${X11ROOT_PREFIX}/bin/cleanlinks +${X11ROOT_PREFIX}/bin/gccmakedep +${X11ROOT_PREFIX}/bin/imake +${X11ROOT_PREFIX}/bin/lndir +${X11ROOT_PREFIX}/bin/makedepend +${X11ROOT_PREFIX}/bin/makeg +${X11ROOT_PREFIX}/bin/makestrs +${X11ROOT_PREFIX}/bin/mergelib +${X11ROOT_PREFIX}/bin/mkdirhier +${X11ROOT_PREFIX}/bin/mkhtmlindex +${X11ROOT_PREFIX}/bin/pswrap +${X11ROOT_PREFIX}/bin/revpath +${X11ROOT_PREFIX}/bin/rman +${X11ROOT_PREFIX}/bin/xmkmf +${X11ROOT_PREFIX}/lib/X11/config/Amoeba.cf +${X11ROOT_PREFIX}/lib/X11/config/DGUX.cf +${X11ROOT_PREFIX}/lib/X11/config/FreeBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/Imake.cf +${X11ROOT_PREFIX}/lib/X11/config/Imake.rules +${X11ROOT_PREFIX}/lib/X11/config/Imake.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Library.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Mips.cf +${X11ROOT_PREFIX}/lib/X11/config/Motif.rules +${X11ROOT_PREFIX}/lib/X11/config/Motif.tmpl +${X11ROOT_PREFIX}/lib/X11/config/NetBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/Oki.cf +${X11ROOT_PREFIX}/lib/X11/config/OpenBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/QNX4.cf +${X11ROOT_PREFIX}/lib/X11/config/QNX4.rules +${X11ROOT_PREFIX}/lib/X11/config/Server.tmpl +${X11ROOT_PREFIX}/lib/X11/config/ServerLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Threads.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Win32.cf +${X11ROOT_PREFIX}/lib/X11/config/Win32.rules +${X11ROOT_PREFIX}/lib/X11/config/WinLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/X11.rules +${X11ROOT_PREFIX}/lib/X11/config/X11.tmpl +${X11ROOT_PREFIX}/lib/X11/config/apollo.cf +${X11ROOT_PREFIX}/lib/X11/config/bsd.cf +${X11ROOT_PREFIX}/lib/X11/config/bsdLib.rules +${X11ROOT_PREFIX}/lib/X11/config/bsdLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/bsdi.cf +${X11ROOT_PREFIX}/lib/X11/config/cde.rules +${X11ROOT_PREFIX}/lib/X11/config/cde.tmpl +${X11ROOT_PREFIX}/lib/X11/config/convex.cf +${X11ROOT_PREFIX}/lib/X11/config/cray.cf +${X11ROOT_PREFIX}/lib/X11/config/cygwin.cf +${X11ROOT_PREFIX}/lib/X11/config/cygwin.rules +${X11ROOT_PREFIX}/lib/X11/config/cygwin.tmpl +${X11ROOT_PREFIX}/lib/X11/config/darwin.cf +${X11ROOT_PREFIX}/lib/X11/config/darwinLib.rules +${X11ROOT_PREFIX}/lib/X11/config/darwinLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/date.def +${X11ROOT_PREFIX}/lib/X11/config/fujitsu.cf +${X11ROOT_PREFIX}/lib/X11/config/generic.cf +${X11ROOT_PREFIX}/lib/X11/config/gnu.cf +${X11ROOT_PREFIX}/lib/X11/config/gnuLib.rules +${X11ROOT_PREFIX}/lib/X11/config/gnuLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/host.def +${X11ROOT_PREFIX}/lib/X11/config/hp.cf +${X11ROOT_PREFIX}/lib/X11/config/hpLib.rules +${X11ROOT_PREFIX}/lib/X11/config/hpLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/ibm.cf +${X11ROOT_PREFIX}/lib/X11/config/ibmLib.rules +${X11ROOT_PREFIX}/lib/X11/config/ibmLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/isc.cf +${X11ROOT_PREFIX}/lib/X11/config/linux.cf +${X11ROOT_PREFIX}/lib/X11/config/lnxLib.rules +${X11ROOT_PREFIX}/lib/X11/config/lnxLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/lnxdoc.rules +${X11ROOT_PREFIX}/lib/X11/config/lnxdoc.tmpl +${X11ROOT_PREFIX}/lib/X11/config/luna.cf +${X11ROOT_PREFIX}/lib/X11/config/lynx.cf +${X11ROOT_PREFIX}/lib/X11/config/macII.cf +${X11ROOT_PREFIX}/lib/X11/config/mach.cf +${X11ROOT_PREFIX}/lib/X11/config/minix.cf +${X11ROOT_PREFIX}/lib/X11/config/moto.cf +${X11ROOT_PREFIX}/lib/X11/config/ncr.cf +${X11ROOT_PREFIX}/lib/X11/config/nec.cf +${X11ROOT_PREFIX}/lib/X11/config/necLib.rules +${X11ROOT_PREFIX}/lib/X11/config/necLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/noop.rules +${X11ROOT_PREFIX}/lib/X11/config/nto.cf +${X11ROOT_PREFIX}/lib/X11/config/nto.rules +${X11ROOT_PREFIX}/lib/X11/config/oldlib.rules +${X11ROOT_PREFIX}/lib/X11/config/os2.cf +${X11ROOT_PREFIX}/lib/X11/config/os2.rules +${X11ROOT_PREFIX}/lib/X11/config/os2Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/os2Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/osf1.cf +${X11ROOT_PREFIX}/lib/X11/config/osfLib.rules +${X11ROOT_PREFIX}/lib/X11/config/osfLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/pegasus.cf +${X11ROOT_PREFIX}/lib/X11/config/sco.cf +${X11ROOT_PREFIX}/lib/X11/config/sco5.cf +${X11ROOT_PREFIX}/lib/X11/config/scoLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sequent.cf +${X11ROOT_PREFIX}/lib/X11/config/sgi.cf +${X11ROOT_PREFIX}/lib/X11/config/sgiLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sgiLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/site.def +${X11ROOT_PREFIX}/lib/X11/config/sony.cf +${X11ROOT_PREFIX}/lib/X11/config/sun.cf +${X11ROOT_PREFIX}/lib/X11/config/sunLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sunLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/sv3Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/sv3Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/sv4Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/sv4Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/svr3.cf +${X11ROOT_PREFIX}/lib/X11/config/svr4.cf +${X11ROOT_PREFIX}/lib/X11/config/ultrix.cf +${X11ROOT_PREFIX}/lib/X11/config/usl.cf +${X11ROOT_PREFIX}/lib/X11/config/version.def +${X11ROOT_PREFIX}/lib/X11/config/x386.cf +${X11ROOT_PREFIX}/lib/X11/config/xf86.rules +${X11ROOT_PREFIX}/lib/X11/config/xf86.tmpl +${X11ROOT_PREFIX}/lib/X11/config/xf86site.def +${X11ROOT_PREFIX}/lib/X11/config/xfree86.cf +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/ccmakedep.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/cleanlinks.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/gccmakedep.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/imake.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/lndir.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makedepend.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makeg.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makestrs.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mergelib.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mkdirhier.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mkhtmlindex.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/pswrap.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/revpath.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/rman.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/xmkmf.${MAN_SUFFIX} diff --git a/x11/imake/distinfo b/x11/imake/distinfo index 9520c76135e..8cd94d12f80 100644 --- a/x11/imake/distinfo +++ b/x11/imake/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.2 2004/01/31 14:38:15 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ -SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b -Size (X430src-1.tgz) = 10993622 bytes -SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66 -Size (X430src-3.tgz) = 12366363 bytes +SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 +Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes +SHA1 (XFree86-4.4.0-src-3.tgz) = a012694d5a5aa3df1d9a3a52363d73cf8f03326b +Size (XFree86-4.4.0-src-3.tgz) = 11239253 bytes SHA1 (patch-aa) = 554472267b9a5bc6614b11c6688325c1fd7ffc0e SHA1 (patch-ab) = f9da29ae63b2adc563df4230ce8daa9fc75ad8ca -SHA1 (patch-ac) = 77568c9cddca68e910e6db8d6d7baa5e495a0fb5 -SHA1 (patch-ad) = dc2cd430ed18f950e32e55a262de845e905199ad -SHA1 (patch-ae) = 8a2032645c204d07ed9a7d501fc929ebe022d741 -SHA1 (patch-af) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa -SHA1 (patch-ag) = 32e12b0470daa93964ba489ce650f5ffb1317b0c -SHA1 (patch-ah) = bec3d071020c9354c7f1203d0467343b32298518 +SHA1 (patch-ac) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa +SHA1 (patch-ad) = 90584e5732fb882f431afd69f6fd1c26c9d22bee +SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67 +SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d diff --git a/x11/imake/files/host.def b/x11/imake/files/host.def index 7039cb0c511..ddd18436ce4 100644 --- a/x11/imake/files/host.def +++ b/x11/imake/files/host.def @@ -1,10 +1,5 @@ -/* - * $NetBSD: host.def,v 1.2 2004/02/02 14:14:45 xtraeme Exp $ - * - * XFree86 packages for pkgsrc system - * - */ +/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ */ -#define ProjectRoot @PREFIX@/X11R6 +#define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO #define MakeCmd @MAKE@ diff --git a/x11/imake/patches/patch-ac b/x11/imake/patches/patch-ac index 2a50ba5c0bf..7693a131306 100644 --- a/x11/imake/patches/patch-ac +++ b/x11/imake/patches/patch-ac @@ -1,62 +1,12 @@ -$NetBSD: patch-ac,v 1.2 2004/01/31 14:38:15 xtraeme Exp $ +$NetBSD: patch-ac,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ ---- 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 - */ --#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ --#else --# define CcCmd cc --# define CplusplusCmd c++ --#endif -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ - --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -177,7 +172,7 @@ - #if defined(UseInstalled) - #define DefaultCCOptions /**/ - #else --#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions -+#define DefaultCCOptions -ansi -Dasm=__asm - #endif - #endif - #ifndef ExtraLibraries -@@ -482,18 +477,9 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 --#endif --#endif - --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#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) +--- config/pswrap/Imakefile.orig 2003-07-24 01:45:49.000000000 +0200 ++++ config/pswrap/Imakefile 2003-07-24 01:46:00.000000000 +0200 +@@ -4,7 +4,6 @@ + DEFINES = -DXENVIRONMENT + DEPLIBS = + YFLAGS = -d +-EXTRA_LIBRARIES = LexLib + + SRCS = main.c pswdict.c pswfile.c \ + systemnames.c psw.c pswstring.c pswsemantics.c diff --git a/x11/imake/patches/patch-ad b/x11/imake/patches/patch-ad index ea5cc81c2ff..59880c05ad9 100644 --- a/x11/imake/patches/patch-ad +++ b/x11/imake/patches/patch-ad @@ -1,59 +1,18 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2004/03/28 22:06:16 xtraeme Exp $ ---- config/cf/NetBSD.cf.in.orig 2003-07-21 09:42:40.000000000 +0000 -+++ config/cf/NetBSD.cf.in 2003-07-21 09:47:58.000000000 +0000 -@@ -89,22 +89,28 @@ - - #define HasVarRun YES - #define HasVarDb YES -+#define HasShadowPasswd NO - - #define InstallXloadSetGID NO - --/* Defines for using the GNU pth thread library -- experimental */ -+#ifndef NetBSDThreads -+# define NetBSDThreads YES -+#endif - --#ifdef NetBSDPth --#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */ --#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */ --#define HasThreadSafeAPI NO --#define HasPosixThreads YES --#define SystemMTDefines -D_REENTRANT PthreadHLocation --#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread --#define SharedX11Reqs ThreadsLibraries -+#if NetBSDThreads && \ -+ ((OSMajorVersion > 1) || \ -+ (OSMajorVersion == 1 && OSMinorVersion > 6) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13)) -+ -+# define HasPosixThreads YES -+# define ThreadedX YES -+# define HasThreadSafeAPI YES -+# define ThreadsLibraries -lpthread -+# define LibraryMTDefines -DUSE_NBSD_THREADLIB -+# define SystemMTDefines -D_REENTRANT -+# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - #else --#define HasPosixThreads NO --#define ThreadedX NO -+# define ThreadedX NO - #endif - - /* -@@ -122,8 +128,7 @@ - +--- config/cf/NetBSD.cf.in.orig 2004-03-03 07:53:38.000000000 +0000 ++++ config/cf/NetBSD.cf.in 2004-03-03 07:54:59.000000000 +0000 +@@ -143,7 +143,7 @@ #define MkdirHierCmd mkdir -p --#undef CcCmd + #undef CcCmd -#define CcCmd gcc +#define CcCmd @@PKGSRC_CC@@ #ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ -@@ -143,7 +148,7 @@ - #define UseGccMakeDepend YES +@@ -159,7 +159,7 @@ + #endif #endif -#define CppCmd cpp @@ -61,20 +20,22 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ #define StandardCppOptions -traditional #define StandardCppDefines /**/ #define PreProcessCmd CcCmd -E -@@ -191,10 +196,10 @@ - # ifndef DefaultGcc2i386Opt - # if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) - /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ --# define DefaultGcc2i386Opt -O2 -+# define DefaultGcc2i386OpT - # endif - # endif +@@ -208,13 +208,7 @@ + #define HasWeakSymbols UseElfFormat + + #ifdef i386Architecture +-# ifndef DefaultGcc2i386Opt +-# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) +- /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ +-# define DefaultGcc2i386Opt -O2 GccAliasingArgs +-# endif +-# endif -# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ # if OSMajorVersion < 1 # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF # else -@@ -204,7 +209,7 @@ +@@ -224,7 +218,7 @@ # define ServerExtraSysLibs -li386 # endif #else diff --git a/x11/imake/patches/patch-ae b/x11/imake/patches/patch-ae index 09dbede361d..5e237eeb666 100644 --- a/x11/imake/patches/patch-ae +++ b/x11/imake/patches/patch-ae @@ -1,15 +1,58 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ - ---- extras/rman/rman.c.orig Tue Jul 15 23:53:53 2003 -+++ extras/rman/rman.c Tue Jul 15 23:44:21 2003 -@@ -4104,6 +4104,9 @@ - } - } - break; -+ case 0: -+ /* ignore */ -+ break; - default: /* unknown escaped character */ - sputchar(*p++); - } +$NetBSD: patch-ae,v 1.2 2004/03/28 22:06:16 xtraeme Exp $ +--- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 ++++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 +@@ -190,11 +190,11 @@ + # define CcCmd $(CLIENTENVSETUP) cc + # define CplusplusCmd $(CLIENTENVSETUP) c++ + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + #endif + +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -207,7 +207,7 @@ + #else + #define NoSystemWarn + #endif +-#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ ++#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ + GccWarningOptions + #endif + #endif +@@ -439,18 +439,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC + #endif + +-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ +-#ifndef DefaultGcc2i386Opt +-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs +-#endif +-#endif +- +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else +-# define OptimizedCDebugFlags -O +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + + #ifndef PreIncDir + # define PreIncDir /usr/include +@@ -476,7 +466,7 @@ + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO + #endif + + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/imake/patches/patch-af b/x11/imake/patches/patch-af index 76c7ecb47cf..292960d3202 100644 --- a/x11/imake/patches/patch-af +++ b/x11/imake/patches/patch-af @@ -1,12 +1,41 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2004/03/28 22:06:16 xtraeme Exp $ ---- config/pswrap/Imakefile.orig 2003-07-24 01:45:49.000000000 +0200 -+++ config/pswrap/Imakefile 2003-07-24 01:46:00.000000000 +0200 -@@ -4,7 +4,6 @@ - DEFINES = -DXENVIRONMENT - DEPLIBS = - YFLAGS = -d --EXTRA_LIBRARIES = LexLib +--- config/cf/linux.cf.in.orig 2004-03-03 07:44:42.000000000 +0000 ++++ config/cf/linux.cf.in 2004-03-03 07:46:51.000000000 +0000 +@@ -549,15 +549,15 @@ + # if defined (i386Architecture) && ((GccMajorVersion >3) \ + || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) + # ifndef CcCmd +-# define CcCmd gcc -m32 ++# define CcCmd @@PKGSRC_CC@@ + # endif + # ifndef CplusplusCmd +-# define CplusplusCmd c++ -m32 ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # endif + # ifndef CcCmd +-# define CcCmd gcc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # ifndef AsCmd + # define AsCmd CcCmd -c -x assembler +@@ -721,7 +721,6 @@ + #define YaccCmd bison -y + #define LexCmd flex -l + #define HasFlex YES +-#define LexLib -lfl + #define PreProcessCmd CcCmd -E + #define PostIncDir DefaultGccIncludeDir + #define LdCombineFlags -r +@@ -791,7 +790,7 @@ - SRCS = main.c pswdict.c pswfile.c \ - systemnames.c psw.c pswstring.c pswsemantics.c + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/imake/patches/patch-ag b/x11/imake/patches/patch-ag deleted file mode 100644 index 5e9bcf9ff25..00000000000 --- a/x11/imake/patches/patch-ag +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $ - ---- config/cf/X11.tmpl.orig 2003-07-25 21:13:11.000000000 +0200 -+++ config/cf/X11.tmpl 2003-07-25 21:14:34.000000000 +0200 -@@ -167,7 +167,7 @@ - #define MaxUCSChar 0x3200 - #endif - #ifndef DerivedUCSFonts --#define DerivedUCSFonts HasPerl5 -+#define DerivedUCSFonts YES - #endif - /* These primarily control generation of derived 8-bit fonts. */ - #ifndef BuildUCSFonts -@@ -1591,7 +1591,7 @@ - # else - MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh - # endif -- UCS2ANY = $(FONTSRC)/util/ucs2any.pl -+ UCS2ANY = $(FONTSRC)/util/ucs2any - BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl - UCSMAPPREFIX = $(FONTSRC)/util/map- - #endif -@@ -3797,18 +3797,16 @@ - - - #ifndef MakeBdfFontFromUCSMaster --#if HasPerl5 - #define MakeBdfFontFromUCSMaster(font,enc) @@\ - includes:: font-enc.bdf @@\ - @@\ - font-enc.bdf: font.bdf $(UCS2ANY) @@\ - RemoveFile($@) @@\ -- RunPerlScript($(UCS2ANY),font.bdf $(UCSMAPPREFIX)enc enc) @@\ -+ $(UCS2ANY) font.bdf $(UCSMAPPREFIX)enc enc @@\ - @@\ - clean:: @@\ - RemoveFile(font-enc.bdf) - #endif --#endif - - #ifndef MakeTruncatedUCSBdfFont - #if HasPerl5 diff --git a/x11/imake/patches/patch-ah b/x11/imake/patches/patch-ah deleted file mode 100644 index 9b0942c448e..00000000000 --- a/x11/imake/patches/patch-ah +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ - ---- config/cf/linux.cf.in.orig 2003-07-24 05:18:24.000000000 +0200 -+++ config/cf/linux.cf.in 2003-07-24 05:20:54.000000000 +0200 -@@ -555,15 +555,15 @@ - # if defined (i386Architecture) && ((GccMajorVersion >3) \ - || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) - # ifndef CcCmd --# define CcCmd gcc -m32 -+# define CcCmd @@PKGSRC_CC@@ - # endif - # ifndef CplusplusCmd --# define CplusplusCmd c++ -m32 -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # endif - # ifndef CcCmd --# define CcCmd gcc --# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # ifndef AsCmd - # define AsCmd CcCmd -c -x assembler -@@ -715,7 +715,6 @@ - #define YaccCmd bison -y - #define LexCmd flex -l - #define HasFlex YES --#define LexLib -lfl - #define PreProcessCmd CcCmd -E - #define PostIncDir DefaultGccIncludeDir - #define LdCombineFlags -r -@@ -775,7 +774,7 @@ - - #ifdef i386Architecture - # ifndef OptimizedCDebugFlags --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # endif - # define LinuxMachineDefines -D__i386__ - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET |