diff options
Diffstat (limited to 'x11/xorg-imake')
| -rw-r--r-- | x11/xorg-imake/DESCR | 3 | ||||
| -rw-r--r-- | x11/xorg-imake/Makefile | 114 | ||||
| -rw-r--r-- | x11/xorg-imake/PLIST | 144 | ||||
| -rw-r--r-- | x11/xorg-imake/distinfo | 19 | ||||
| -rw-r--r-- | x11/xorg-imake/files/host.def | 5 | ||||
| -rw-r--r-- | x11/xorg-imake/files/xorgsite.def | 27 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-aa | 14 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ab | 12 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ac | 87 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ad | 38 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ae | 55 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ag | 26 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ah | 51 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ai | 14 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-aj | 40 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-ak | 16 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-al | 22 |
17 files changed, 0 insertions, 687 deletions
diff --git a/x11/xorg-imake/DESCR b/x11/xorg-imake/DESCR deleted file mode 100644 index 992f3691726..00000000000 --- a/x11/xorg-imake/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -The xorg-imake package provides various utilities, such as imake, lndir, -mkdirhier, xmkmf, and others. These utilities are from X.org, although -an X server and X libraries are not needed. diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile deleted file mode 100644 index 62cfc420074..00000000000 --- a/x11/xorg-imake/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $ - -DISTNAME= ${DISTFILES} -PKGNAME= xorg-imake-${XORG_VER} -PKGREVISION= 5 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://www.x.org/ -COMMENT= Imake and other utilities from X.org - -PKG_INSTALLATION_TYPES= overwrite pkgviews -PKG_DESTDIR_SUPPORT= user-destdir - -USE_DIRS+= xorg-1.1 -INSTALL_TARGET= install install.man -NO_XORG_TARGETS= yes - -USE_TOOLS+= perl:run -REPLACE_PERL+= config/util/mkhtmlindex.pl - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Linux" -DEPENDS+= bison-[0-9]*:../../devel/bison -DEPENDS+= flex-[0-9]*:../../devel/flex -PLIST_SUBST+= LNDIR= -.elif ${OPSYS} == "OpenBSD" -PLIST_SUBST+= LNDIR="@comment " -.else -PLIST_SUBST+= LNDIR= -.endif - -.include "../../meta-pkgs/xorg/Makefile.common" - -post-extract: - @${TOUCH} ${WRKSRC}/config/cf/date.def -.for F in ${SYSTEMS} - @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in -.endfor -.undef F - @${SED} -e "s|CONFIGDIRSPEC|-I${X11ROOT}/lib/X11/config|" \ - ${WRKSRC}/config/util/xmkmf.cpp > \ - ${WRKSRC}/config/util/xmkmf.cpp.orig - @${MV} ${WRKSRC}/config/util/xmkmf.cpp.orig \ - ${WRKSRC}/config/util/xmkmf.cpp - -pre-configure: -.for F in ${SYSTEMS} - @${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \ - -e "s|@@PKGSRC_CPP@@|${CPP}|g" \ - -e "s|@@PKGSRC_CXX@@|${CXX}|g" \ - -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \ - -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \ - ${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf -.endfor -.undef F - @( \ - ${ECHO} "#define XORG_VERSION_MAJOR 6"; \ - ${ECHO} "#define XORG_VERSION_MINOR 9"; \ - ${ECHO} "#define XORG_VERSION_PATCH 0"; \ - ${ECHO} "#define XORG_VERSION_SNAP 0"; \ - ) > ${WRKSRC}/config/cf/version.def - -do-build: - @${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}/config/cf - @${SED} -e "s|@PREFIX@|${X11ROOT}|g" \ - -e "s|@BLNK@|${BUILDLINK_DIR}|g" \ - -e "s|@LOCALBASE@|${LOCALBASE}|g " \ - -e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \ - ${WRKSRC}/config/cf/host.def - cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile.boot && \ - ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes - -pre-install: - @${CP} ${WRKSRC}/xmakefile ${WRKSRC}/xmakefile.bak - @${SED} 's/SUBDIRS = include/SUBDIRS =/' ${WRKSRC}/xmakefile.bak > \ - ${WRKSRC}/xmakefile - -post-install: - ${CHMOD} ${NONBINMODE} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def - @${CP} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def \ - ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig - @${SED} -e "s|\#define ProjectRoot ${X11ROOT}||" \ - ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig > \ - ${DESTDIR}${X11ROOT}/lib/X11/config/host.def - @${RM} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig - - @( \ - ${ECHO}; \ - ${ECHO} "#ifdef BeforeVendorCF"; \ - ${ECHO} "#define ProjectRoot ${X11ROOT}"; \ - ${ECHO} "#endif"; \ - ) >> ${DESTDIR}${X11ROOT}/lib/X11/config/host.def - -.if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*) || \ - !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) -. if exists(/usr/include/threadlib.h) -SUBST_CLASSES+= thr -SUBST_STAGE.thr= post-patch -SUBST_FILES.thr= config/cf/NetBSD.cf.in -SUBST_SED.thr= -e 's|@@NETBSD_THREADLIB@@|-DUSE_NBSD_THREADLIB|' -SUBST_MESSAGE.thr= Fixes for threadlib.h. -. else -SUBST_CLASSES+= nada -SUBST_STAGE.nada= post-patch -SUBST_FILES.nada= config/cf/NetBSD.cf.in -SUBST_SED.nada= -e 's|@@NETBSD_THREADLIB@@||' -. endif -.endif - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xorg-imake/PLIST b/x11/xorg-imake/PLIST deleted file mode 100644 index bfb587270f9..00000000000 --- a/x11/xorg-imake/PLIST +++ /dev/null @@ -1,144 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2006/01/18 23:53:06 xtraeme Exp $ -${X11ROOT_PREFIX}/bin/ccmakedep -${X11ROOT_PREFIX}/bin/cleanlinks -${X11ROOT_PREFIX}/bin/gccmakedep -${X11ROOT_PREFIX}/bin/imake -${LNDIR}${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/DragonFly.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/mingw.cf -${X11ROOT_PREFIX}/lib/X11/config/mingw.rules -${X11ROOT_PREFIX}/lib/X11/config/mingw.tmpl -${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 -${X11ROOT_PREFIX}/lib/X11/config/xorg.cf -${X11ROOT_PREFIX}/lib/X11/config/xorg.tmpl -${X11ROOT_PREFIX}/lib/X11/config/xorgsite.def -${X11ROOT_PREFIX}/lib/X11/config/xorgversion.def -${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/xorg-imake/distinfo b/x11/xorg-imake/distinfo deleted file mode 100644 index 7454ec8cbe4..00000000000 --- a/x11/xorg-imake/distinfo +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: distinfo,v 1.24 2006/12/16 11:32:44 abs Exp $ - -SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef -RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 -Size (X11R6.9.0-src1.tar.gz) = 33460996 bytes -SHA1 (X11R6.9.0-src3.tar.gz) = 0c8a0d6f9471ec022e12e2688d1991c985a1efb2 -RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414 -Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes -SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322 -SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa -SHA1 (patch-ac) = 9df1808bf84dbb78130287d69d619ca4359d3f47 -SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b -SHA1 (patch-ae) = 33233761a745b4c62cf64855a5d9c196cd679cf2 -SHA1 (patch-ag) = ac33ed5da627b4e08bb4de8bfe1edf0cec56b422 -SHA1 (patch-ah) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d -SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162 -SHA1 (patch-aj) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4 -SHA1 (patch-ak) = ea7735f8d160993753b7ecc70dea9585f619cd67 -SHA1 (patch-al) = 99e0ec0a7119ccc8d0df72dec67ee5e4fe0dd5c7 diff --git a/x11/xorg-imake/files/host.def b/x11/xorg-imake/files/host.def deleted file mode 100644 index 02f182139e5..00000000000 --- a/x11/xorg-imake/files/host.def +++ /dev/null @@ -1,5 +0,0 @@ -/* $NetBSD: host.def,v 1.2 2004/07/31 01:37:23 xtraeme Exp $ */ - -#define ProjectRoot @PREFIX@ -#define BuildHtmlManPages NO -#define MakeCmd @MAKE@ diff --git a/x11/xorg-imake/files/xorgsite.def b/x11/xorg-imake/files/xorgsite.def deleted file mode 100644 index 1b4ad9df800..00000000000 --- a/x11/xorg-imake/files/xorgsite.def +++ /dev/null @@ -1,27 +0,0 @@ -/* - * $NetBSD: xorgsite.def,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ - * - * X.org packages for pkgsrc system - * - */ - -#ifndef HasSecureRPC -#define HasSecureRPC YES -#endif -#ifndef BuildAoutLibraries -#define BuildAoutLibraries NO -#endif -#ifndef InstallXdmConfig -#define InstallXdmConfig YES -#endif -#ifndef InstallXinitConfig -#define InstallXinitConfig YES -#endif -#ifndef InstallAppDefFiles -#define InstallAppDefFiles YES -#endif -#define HasXdmAuth YES -#define BuildXF86Setup NO -#define NothingOutsideProjectRoot YES - -#define BuildDPSLibrary YES diff --git a/x11/xorg-imake/patches/patch-aa b/x11/xorg-imake/patches/patch-aa deleted file mode 100644 index cc1179cdaef..00000000000 --- a/x11/xorg-imake/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ - ---- Imakefile Wed Mar 24 19:16:46 2004 -+++ Imakefile Wed Mar 24 19:17:07 2004 -@@ -30,8 +30,7 @@ - #endif - #endif - -- SUBDIRS = include config lib $(NLSSUBDIR) \ -- programs $(FONTSDIR) $(DOCSDIR) -+ SUBDIRS = include config - LNINSTALLDIRS = lib - - #if HasParallelMake diff --git a/x11/xorg-imake/patches/patch-ab b/x11/xorg-imake/patches/patch-ab deleted file mode 100644 index 5c7c6954e60..00000000000 --- a/x11/xorg-imake/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/07/29 04:49:53 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 - - SRCS = main.c pswdict.c pswfile.c \ - systemnames.c psw.c pswstring.c pswsemantics.c diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac deleted file mode 100644 index ddc3ac22ad4..00000000000 --- a/x11/xorg-imake/patches/patch-ac +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2006/07/31 16:39:42 joerg Exp $ - ---- config/cf/NetBSD.cf.in.orig 2005-11-30 06:20:06.000000000 +0100 -+++ config/cf/NetBSD.cf.in -@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor - # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ - (OSMajorVersion == 2 && OSMinorVersion < 99) || \ - (OSMajorVersion < 2)) --# define LibraryMTDefines -DUSE_NBSD_THREADLIB -+# define LibraryMTDefines @@NETBSD_THREADLIB@@ - # endif - # define SystemMTDefines -D_REENTRANT - # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -@@ -150,7 +150,7 @@ XCOMM operating system: OSName (OSMajor - #define MkdirHierCmd mkdir -p - - #undef CcCmd --#define CcCmd gcc -+#define CcCmd @@PKGSRC_CC@@ - #ifndef DefaultCCOptions - #if defined(UseInstalled) - #define DefaultCCOptions /**/ -@@ -166,7 +166,7 @@ XCOMM operating system: OSName (OSMajor - #endif - #endif - --#define CppCmd cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ - #define PreProcessCmd CcCmd -E -@@ -195,7 +195,7 @@ XCOMM operating system: OSName (OSMajor - * Disabled for NetBSD/vax until I figure out the scheme. --CS - */ - #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \ -- defined(PpcArchitecture) -+ defined(PpcArchitecture) || defined(AMD64Architecture) - # ifndef DoLoadableServer - # define DoLoadableServer YES - # endif -@@ -231,7 +231,7 @@ XCOMM operating system: OSName (OSMajor - # define ServerExtraSysLibs -li386 - # endif - #else --# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags -O2 GccAliasingArgs - # if defined(SparcArchitecture) - # define ServerOSDefines -DDDXOSINIT - # elif defined(AlphaArchitecture) -@@ -284,6 +284,8 @@ XCOMM operating system: OSName (OSMajor - # ifndef XFree86ConsoleDefines - # define XFree86ConsoleDefines -DWSCONS_SUPPORT - # endif -+#elif defined(ia64Architecture) || defined(AMD64Architecture) -+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 - #else - # define ServerExtraDefines GccGasOption - #endif -@@ -404,6 +406,10 @@ XCOMM operating system: OSName (OSMajor - # endif /* MTRRBuiltin */ - #endif /* i386Architecture */ - -+#if defined(AMD64Architecture) -+# define HasMTRRBuiltin YES -+#endif -+ - /* - * agpgart support (NetBSD 1.5Y and up) - */ -@@ -590,7 +596,7 @@ InstallManPageAliasesBase(file,destdir,a - # define BuildXInputLib YES - #endif - --#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) -+#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture) - # include <xorg.cf> - #endif - -@@ -651,7 +664,7 @@ sed 's/\.[0-9]*$$//'` - */ - #ifdef PpcArchitecture - --# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags -O2 GccAliasingArgs - # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT - - # ifndef DoLoadableServer diff --git a/x11/xorg-imake/patches/patch-ad b/x11/xorg-imake/patches/patch-ad deleted file mode 100644 index 9431f1b6049..00000000000 --- a/x11/xorg-imake/patches/patch-ad +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2004/10/08 03:35:25 xtraeme Exp $ - ---- config/cf/FreeBSD.cf.in.orig Fri Oct 8 02:16:19 2004 -+++ config/cf/FreeBSD.cf.in Fri Oct 8 02:18:01 2004 -@@ -173,12 +173,12 @@ - #endif - - #ifndef CcCmd --#define CcCmd cc -+#define CcCmd @@PKGSRC_CC@@ - #endif - #ifndef CplusplusCmd --#define CplusplusCmd c++ -+#define CplusplusCmd @@PKGSRC_CXX@@ - #endif --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -466,7 +466,7 @@ - /* 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 -+#define DefaultGcc2i386Opt @@PKGSRC_CFLAGS@@ - #endif - #endif - -@@ -500,7 +500,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/xorg-imake/patches/patch-ae b/x11/xorg-imake/patches/patch-ae deleted file mode 100644 index 663a82cb453..00000000000 --- a/x11/xorg-imake/patches/patch-ae +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2006/06/12 00:36:25 joerg Exp $ - ---- config/cf/linux.cf.in.orig 2005-12-06 11:06:50.000000000 +0100 -+++ config/cf/linux.cf.in 2005-12-06 11:09:08.000000000 +0100 -@@ -609,10 +609,10 @@ - # 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 - # if defined (Ppc64Architecture) -@@ -624,8 +624,8 @@ - # 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 -@@ -779,7 +779,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 -@@ -853,7 +852,7 @@ - - #ifdef i386Architecture - # ifndef OptimizedCDebugFlags --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # endif - # define LinuxMachineDefines -D__i386__ - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file - #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) - - #if HaveLib64 --# ifndef LibDirName --# define LibDirName lib64 --# endif - # ifndef SystemUsrLibDir - # define SystemUsrLibDir /usr/lib64 - # endif diff --git a/x11/xorg-imake/patches/patch-ag b/x11/xorg-imake/patches/patch-ag deleted file mode 100644 index f43ccbb38a1..00000000000 --- a/x11/xorg-imake/patches/patch-ag +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2006/12/16 11:32:44 abs Exp $ - ---- config/cf/Imake.cf.orig 2005-11-08 06:33:24.000000000 +0000 -+++ config/cf/Imake.cf -@@ -234,8 +234,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v - # ifdef mc68000 - # define Mc68020Architecture - # endif --# ifdef __arm32__ -+# if defined(__arm__) || defined(__arm32__) - # define Arm32Architecture -+# undef __arm__ - # undef __arm32__ - # endif - # ifdef __vax__ -@@ -246,6 +247,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v - # define PpcArchitecture - # undef __powerpc__ - # endif -+# ifdef __x86_64__ -+# define AMD64Architecture -+# undef __x86_64__ -+# endif - #endif /* NetBSD */ - - /* Systems based on kernel of NetBSD */ diff --git a/x11/xorg-imake/patches/patch-ah b/x11/xorg-imake/patches/patch-ah deleted file mode 100644 index 387f09d7347..00000000000 --- a/x11/xorg-imake/patches/patch-ah +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ - ---- config/cf/darwin.cf.in.orig 2005-12-06 11:18:05.000000000 +0100 -+++ config/cf/darwin.cf.in 2005-12-06 11:20:10.000000000 +0100 -@@ -97,7 +97,7 @@ - * Turn off to build on raw Darwin systems. - */ - #ifndef DarwinQuartzSupport --# define DarwinQuartzSupport YES -+# define DarwinQuartzSupport @@DARWIN_USE_QUARTZ@@ - #endif - - #if DarwinQuartzSupport -@@ -170,7 +170,7 @@ - * so we use the 3.1-based version in this case. - */ - #if (GccMajorVersion == 3) && (GccMinorVersion == 3) --# define CppCmd /usr/bin/cpp3 -+# define CppCmd /usr/bin/cpp - #else - # define CppCmd /usr/bin/cpp - #endif -@@ -184,8 +184,8 @@ - #endif - - /* we have a gcc compatible compiler, but its not called gcc */ --#define CcCmd /usr/bin/cc --#define CplusplusCmd /usr/bin/c++ -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ - - /* default flags to pass to cc */ - #ifndef DefaultCCOptions -@@ -213,7 +213,7 @@ - #ifdef PpcDarwinArchitecture - # define DarwinMachineDefines -D__powerpc__ - # if HasGcc3 --# define OptimizedCDebugFlags -Os -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # else - # define OptimizedCDebugFlags -O2 - # endif -@@ -223,7 +223,7 @@ - #ifdef i386DarwinArchitecture - # define DarwinMachineDefines -D__i386__ - # if HasGcc3 --# define OptimizedCDebugFlags -Os -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # else - # define OptimizedCDebugFlags -O2 -fno-strength-reduce - # endif diff --git a/x11/xorg-imake/patches/patch-ai b/x11/xorg-imake/patches/patch-ai deleted file mode 100644 index 94250d84845..00000000000 --- a/x11/xorg-imake/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2005/02/10 17:00:38 xtraeme Exp $ - ---- config/cf/Imakefile.orig 2005-02-10 15:42:24.000000000 +0000 -+++ config/cf/Imakefile 2005-02-10 15:42:43.000000000 +0000 -@@ -135,7 +135,8 @@ - QNX4.cf \ - darwin.cf \ - xfree86.cf \ --xorg.cf -+xorg.cf \ -+DragonFly.cf - - INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) - diff --git a/x11/xorg-imake/patches/patch-aj b/x11/xorg-imake/patches/patch-aj deleted file mode 100644 index 932ece06d22..00000000000 --- a/x11/xorg-imake/patches/patch-aj +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ - ---- config/cf/DragonFly.cf.in.orig 2006-01-06 13:35:13.000000000 +0000 -+++ config/cf/DragonFly.cf.in -@@ -96,12 +96,12 @@ XCOMM operating system: OSName (OSMajor - #define HasFlex YES - - #ifndef CcCmd --# define CcCmd cc -+# define CcCmd @@PKGSRC_CC@@ - #endif - #ifndef CplusplusCmd --# define CplusplusCmd c++ -+# define CplusplusCmd @@PKGSRC_CXX@@ - #endif --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -148,6 +148,10 @@ XCOMM operating system: OSName (OSMajor - # define HasSSESupport NO - #endif - -+#ifndef BuildDmx -+#define BuildDmx YES -+#endif -+ - #ifndef UseRpath - # define UseRpath YES - #endif -@@ -293,7 +297,7 @@ XCOMM operating system: OSName (OSMajor - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #define HasBsdMake YES diff --git a/x11/xorg-imake/patches/patch-ak b/x11/xorg-imake/patches/patch-ak deleted file mode 100644 index 37d7e3e8ff4..00000000000 --- a/x11/xorg-imake/patches/patch-ak +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ak,v 1.4 2006/09/25 12:49:58 joerg Exp $ - ---- config/cf/bsdLib.rules.orig 2005-06-01 18:09:09.000000000 +0200 -+++ config/cf/bsdLib.rules -@@ -229,11 +229,7 @@ LintLibReferences(varname,libname,libsou - * InstallSharedLibrary - generate rules to install the shared library. - * NOTE: file must be executable, hence "INSTBINFLAGS" - */ --#ifndef FreeBSDArchitecture - INSTALLMINORREV = true --#else --INSTALLMINORREV = false --#endif - - #ifndef InstallSharedLibrary - #define InstallSharedLibrary(libname,rev,dest) @@\ diff --git a/x11/xorg-imake/patches/patch-al b/x11/xorg-imake/patches/patch-al deleted file mode 100644 index 61435a8b8c4..00000000000 --- a/x11/xorg-imake/patches/patch-al +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-al,v 1.3 2006/10/30 10:14:17 dsainty Exp $ - -Run-time path fix for Solaris for the X client libraries. Without this -patch, libraries such as libXext.so will not contain a run-time link path -to /usr/pkg/xorg/lib, causing run time link failures or possibly linking -with other (non-Pkgsrc) X libraries on the system! - ---- config/cf/sun.cf.orig 2005-12-04 06:20:48.000000000 +1300 -+++ config/cf/sun.cf 2006-10-26 13:11:56.535497000 +1300 -@@ -688,10 +688,10 @@ - /* This is to work around what appears to be a PIC bug in some gcc/egcs - versions that shows up with the Solaris 7/x86 <ctype.h>. */ - # define SharedLibraryLdCmd $(LD) --# define SharedLibraryLoadFlags -G -z textwarn -+# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags - # else - # define SharedLibraryLdCmd $(CC) --# define SharedLibraryLoadFlags -shared -z text -+# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags - # endif - # endif - # else |