Remove xpkgwedge, not needed any longer.

12 files changed, 1 insertions, 637 deletions

diff --git a/pkgtools/Makefile b/pkgtools/Makefile
index 7598bf20b93..142ed68153a 100644
--- a/pkgtools/Makefile
+++ b/pkgtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2015/07/04 14:38:28 khorben Exp $
+# $NetBSD: Makefile,v 1.110 2015/08/17 08:15:40 wiz Exp $
 #
 
 COMMENT=	Tools for use in the packages collection
@@ -69,6 +69,5 @@ SUBDIR+=	shlock
 SUBDIR+=	url2pkg
 SUBDIR+=	verifypc
 SUBDIR+=	x11-links
-SUBDIR+=	xpkgwedge
 
 .include "../mk/misc/category.mk"
diff --git a/pkgtools/xpkgwedge/DEINSTALL b/pkgtools/xpkgwedge/DEINSTALL
deleted file mode 100755
index 0e90f9cf628..00000000000
--- a/pkgtools/xpkgwedge/DEINSTALL
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.9 2004/04/30 19:44:21 tv Exp $
-
-FONT_PROGS="@FONT_PROGS@"
-X11BASE=@X11BASE@
-
-X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
-HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
-SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
-SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
-
-case ${STAGE} in
-VIEW-DEINSTALL)
-	${ECHO_N} "Removing font program symlinks from view..."
-	for prog in ${FONT_PROGS}; do
-		if [ -f ${PKG_PREFIX}/bin/$prog -a			\
-		     ${PKG_PREFIX} != ${X11BASE} ]; then
-			${RM} -f ${PKG_PREFIX}/bin/$prog
-		fi
-	done
-	${ECHO} "done."
-
-	${ECHO_N} "Updating ${HOSTDEF}..."
-	${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
-	( ${GREP} -v xpkgwedge ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF}
-	${RM} -f ${HOSTDEF}.bak
-	if [ ${PKG_PREFIX} != ${X11BASE} -a -f ${X11_HOSTDEF} ] && \
-	   ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}; then
-		${RM} -f ${HOSTDEF}
-	fi
-	case `uname`:${X11BASE} in
-	*:*openwin)
-		${RM} -f ${SITEDEF} ${SV4LIB}
-		;;
-	Interix:/usr/X11R6)
-		${RM} -f ${SITEDEF}
-		;;
-	esac
-	${ECHO} "done."
-	;;
-
-DEINSTALL)
-	${ECHO_N} "Removing font program symlinks..."
-	for prog in ${FONT_PROGS}; do
-		if [ -f ${PKG_PREFIX}/bin/$prog -a			\
-		     ${PKG_PREFIX} != ${X11BASE} ]; then
-			${RM} -f ${PKG_PREFIX}/bin/$prog
-		fi
-	done
-	${ECHO} "done."
-	;;
-
-POST-DEINSTALL)
-	${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
-	;;
-esac
diff --git a/pkgtools/xpkgwedge/DESCR b/pkgtools/xpkgwedge/DESCR
deleted file mode 100644
index eca4e106a33..00000000000
--- a/pkgtools/xpkgwedge/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Xpkgwedge, not a "real" program in the traditional sense, is a hack that
-allows users to compile X11 pkgs from pkgsrc and install them outside of
-the X11 tree - even if they use imake - by using pkgxmkmf.
-
-Pkgxmkmf is a slightly modified xmkmf from the X11R6.3 release and supports
-finding config files in ${LOCALBASE}/lib/X11/config, if it exists, and in
-${X11BASE}/lib/X11/config.  In all other respects, it is identical to xmkmf.
-Please refer to xmkmf(1) for more information.
diff --git a/pkgtools/xpkgwedge/INSTALL b/pkgtools/xpkgwedge/INSTALL
deleted file mode 100644
index c164f231e53..00000000000
--- a/pkgtools/xpkgwedge/INSTALL
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: INSTALL,v 1.11 2004/04/30 19:44:21 tv Exp $
-
-FONT_PROGS="@FONT_PROGS@"
-X11BASE=@X11BASE@
-
-X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
-HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
-X11_SITEDEF=${X11BASE}/lib/X11/config/site.def
-SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
-X11_SV4LIB=${X11BASE}/lib/X11/config/sv4Lib.tmpl
-SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
-
-SV4LIB_SUBST_SED="-e s/^	/        /"
-SITEDEF_SUBST_SED="-e s/\#endif.*VendorCF.*/\#include <host.def>\\
-&/"
-
-case ${STAGE} in
-POST-INSTALL)
-	${ECHO_N} "Symlinking font programs..."
-	for prog in ${FONT_PROGS}; do
-		if [ -f ${X11BASE}/bin/$prog -a				\
-		     ${PKG_PREFIX} != ${X11BASE} ]; then
-			${LN} -fs ${X11BASE}/bin/$prog			\
-				${PKG_PREFIX}/bin/$prog
-		fi
-	done
-	${ECHO} "done."
-	;;
-
-VIEW-INSTALL)
-	if [ ${PKG_PREFIX} = ${X11BASE} -o -s ${HOSTDEF} ]; then
-		${ECHO_N} "Updating ${HOSTDEF}..."
-		${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
-	else
-		${ECHO_N} "Creating ${HOSTDEF}..."
-		if [ -f ${X11_HOSTDEF} ]; then
-			${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak
-		else
-			${CP} -f /dev/null ${HOSTDEF}.bak
-		fi
-	fi
-	( ${ECHO} '#include <xpkgwedge.def>';				\
-	  ${GREP} -v xpkgwedge ${HOSTDEF}.bak;				\
-	) > ${HOSTDEF}
-	${RM} -f ${HOSTDEF}.bak
-	${ECHO} "done."
-	case `uname`:${X11BASE} in
-	*:*openwin)
-		${ECHO_N} "Patching OpenWindows templates..."
-		${SED} "${SITEDEF_SUBST_SED}" ${X11_SITEDEF} > ${SITEDEF}
-		${SED} "${SV4LIB_SUBST_SED}" ${X11_SV4LIB} > ${SV4LIB}
-		${ECHO} "done."
-		;;
-	Interix:/usr/X11R6)
-		${ECHO_N} "Patching Interix templates..."
-		${SED} -e "1i\\
-#include <host.def>
-" -e "/CcCmd/d;/ProjectRoot/d" ${X11_SITEDEF} > ${SITEDEF}
-		${ECHO} "done."
-		;;
-	esac
-	;;
-esac
diff --git a/pkgtools/xpkgwedge/MESSAGE b/pkgtools/xpkgwedge/MESSAGE
deleted file mode 100644
index eec7eaefd38..00000000000
--- a/pkgtools/xpkgwedge/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/10/19 07:16:33 grant Exp $
-
-NOTES:
-
-* You MUST set the environment variable XAPPLRESDIR in /etc/profile and
-  /etc/csh.login by hand in order to make pkgs built with xpkgwedge run
-  properly, e.g.
-
-	XAPPLRESDIR=${PREFIX}/lib/X11/app-defaults
-	export XAPPLRESDIR
-
-  and
-
-	setenv XAPPLRESDIR ${PREFIX}/lib/X11/app-defaults
-
-  respectively.
-
-  If any users set XAPPLRESDIR in their own environment, these settings
-  will not work -- such users need to set XUSERFILESEARCHPATH (syntax
-  can be found in XtResolvePathname(3Xt)).
-
-===========================================================================
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
deleted file mode 100644
index 25cf6477b3b..00000000000
--- a/pkgtools/xpkgwedge/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-# $NetBSD: Makefile,v 1.83 2014/10/09 14:06:51 wiz Exp $
-
-PKGNAME=	xpkgwedge-1.17
-CATEGORIES=	pkgtools devel x11
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
-COMMENT=	Allows X11 pkgs to be built and used outside of $${X11BASE}
-LICENSE=	original-bsd
-
-WRKSRC=		${WRKDIR}
-USE_LANGUAGES=	# empty
-NO_BUILD=	yes
-NO_CONFIGURE=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+=	imake:run xmkmf:run
-
-.if ${LOCALBASE} == ${X11BASE}
-PKG_FAIL_REASON+=	"xpkgwedge is not needed when X11BASE is LOCALBASE"
-.endif
-
-.if exists(${X11BASE}/bin/mkfontscale)
-CONFLICTS+=	mkfontscale-[0-9]*
-.endif
-
-INSTALLATION_DIRS=	bin lib/X11/config
-
-# FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow
-# ${PREFIX}/bin/${prog} to always work.
-#
-FONT_PROGS=		bdftopcf fstobdf mkfontdir mkfontscale
-
-FILES_SUBST+=		VIEWBASE=${VIEWBASE}
-FILES_SUBST+=		FONT_PROGS=${FONT_PROGS:Q}
-FILES_SUBST+=		MAKE=${IMAKE_MAKE:Q}
-USE_TOOLS+=		${IMAKE_TOOLS}
-
-PLIST_VARS+=		Darwin IRIX IRIX5 IRIX6
-
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-APPLY_DARWIN_PATCH=	${TRUE}
-PLIST.Darwin=		yes
-USE_TOOLS+=		patch
-.else
-APPLY_DARWIN_PATCH=	${FALSE}
-.endif
-
-.if ${OPSYS} == "IRIX"
-PLIST.IRIX=		yes
-USE_TOOLS+=		patch
-. if !empty(OS_VERSION:M6*)
-PLIST.IRIX6=		yes
-. else
-PLIST.IRIX5=		yes
-. endif
-.endif
-
-.include "../../mk/x11.buildlink3.mk"
-
-SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR}/pkgxmkmf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@X11BASE@,${X11BASE},g'
-SUBST_SED.paths+=	-e 's,@VIEWBASE@,${VIEWBASE},g'
-SUBST_SED.paths+=	-e 's,@MAKE@,${IMAKE_MAKE},g'
-SUBST_STAGE.paths=	post-patch
-
-post-extract:
-	@${CP} ${FILESDIR}/xpkgwedge.def ${WRKSRC}
-	@${CP} ${FILESDIR}/pkgxmkmf.in ${WRKDIR}/pkgxmkmf
-
-.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
-X11TYPEFLAGS?=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-SUBST_CLASSES+=		fix
-SUBST_STAGE.fix=	post-patch
-SUBST_FILES.fix=	xpkgwedge.def
-SUBST_SED.fix=		-e "s|@X11TYPEFLAGS@|${X11TYPEFLAGS}|"
-.else # X11_TYPE == xorg.
-SUBST_CLASSES+=		foo
-SUBST_STAGE.foo=	post-patch
-SUBST_FILES.foo=	xpkgwedge.def
-SUBST_SED.foo=		-e "s|\#define ExtraLoadFlags @X11TYPEFLAGS@||"
-.endif # X11_TYPE == native.
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/config
-	${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${DESTDIR}${PREFIX}/lib/X11/config
-	${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${DESTDIR}${PREFIX}/bin/pkgxmkmf
-	@case ${OPSYS} in \
-	Darwin) \
-	if ${APPLY_DARWIN_PATCH}; then \
-	  ${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
-	  cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \
-	fi; \
-	;; \
-	IRIX) \
-	${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
-	if [ ${OS_VERSION} -ge 6 ]; then \
-		${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${DESTDIR}${PREFIX}/lib/X11/config; \
-		cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \
-	else \
-		${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${DESTDIR}${PREFIX}/lib/X11/config; \
-		cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \
-	fi; \
-	;; \
-	esac
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/xpkgwedge/PLIST b/pkgtools/xpkgwedge/PLIST
deleted file mode 100644
index 16d1b446644..00000000000
--- a/pkgtools/xpkgwedge/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $
-bin/pkgxmkmf
-lib/X11/config/xpkgwedge.def
-${PLIST.Darwin}lib/X11/config/darwin.cf
-${PLIST.IRIX}lib/X11/config/sgi.cf
-${PLIST.IRIX5}lib/X11/config/sgiLib.rules
-${PLIST.IRIX6}lib/X11/config/X11.rules
diff --git a/pkgtools/xpkgwedge/files/darwin.cf.patch b/pkgtools/xpkgwedge/files/darwin.cf.patch
deleted file mode 100644
index 6938429edd7..00000000000
--- a/pkgtools/xpkgwedge/files/darwin.cf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: darwin.cf.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
-
---- darwin.cf.orig	2005-12-04 20:52:30.000000000 +0100
-+++ darwin.cf	2005-12-04 20:51:38.000000000 +0100
-@@ -289,6 +289,8 @@
- # undef ServerExtraDefines
- # define ServerExtraDefines XFree86ServerDefines -UX_BYTE_ORDER -DROOTLESS -DDDXTIME
- 
-+#ifndef InstallFlags
- #define InstallFlags -c -o root -g wheel
-+#endif
- 
- #endif /* XAppleServer */
diff --git a/pkgtools/xpkgwedge/files/irix5.patch b/pkgtools/xpkgwedge/files/irix5.patch
deleted file mode 100644
index 2075cbe51e7..00000000000
--- a/pkgtools/xpkgwedge/files/irix5.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: irix5.patch,v 1.3 2006/09/10 13:44:58 schwarz Exp $
-
---- sgi.cf.orig	2006-09-09 17:13:25.000000000 +0200
-+++ sgi.cf	2006-09-10 10:15:18.000000000 +0200
-@@ -178,8 +178,10 @@
- #define AsCmd $(TOOLROOT)/usr/bin/as
- #define CcCmd $(TOOLROOT)/usr/bin/cc
- #ifdef UseInstalled
-+#ifndef InstallCmd
- #define InstallCmd bsdinst
- #endif
-+#endif
- #ifndef LdCmd
- #define LdCmd $(TOOLROOT)/usr/bin/ld
- #endif
-@@ -188,12 +190,14 @@
-  * Actually, it doesn't matter what MakeCmd is, since we don't use it.
-  * We assume that $(MAKE) gets set for us by make.
-  */
--#define MakeCmd $(TOOLROOT)/bin/make
-+/*#define MakeCmd $(TOOLROOT)/bin/make */
- #define TroffCmd psroff -t
- 
- #define StandardIncludes -nostdinc -I$(ROOT)/usr/include
- 
-+#ifndef ExtraLibraries
- #define ExtraLibraries /**/
-+#endif
- 
- /*
-  * If we specify -nostdlib, we must supply the complete library
-@@ -252,23 +256,19 @@
- #define ManSuffix	1
- #define LibManSuffix	3
- 
--#undef ManDir
--#undef LibmanDir
--#define ManDir $(CATMAN1DIR)$(MANPACKAGE)
--#define LibmanDir $(CATMAN3DIR)$(MANPACKAGE)
- #define NroffManDir $(MAN1DIR)$(MANPACKAGE)
- #define NroffLibmanDir $(MAN3DIR)$(MANPACKAGE)
- 
- #ifdef UseInstalled
--           MANUSR = /usr/share/local
-+           MANUSR = ManUsr
- #else
-            MANUSR = /usr/share
- #endif
- 
--       CATMAN1DIR = $(MANUSR)/catman/u_man/cat1
--       CATMAN3DIR = $(MANUSR)/catman/p_man/cat3
--          MAN1DIR = $(MANUSR)/man/u_man/man1
--          MAN3DIR = $(MANUSR)/man/p_man/man3
-+       CATMAN1DIR = $(MANUSR)/tman/cat1
-+       CATMAN3DIR = $(MANUSR)/tman/cat3
-+          MAN1DIR = $(MANUSR)/man/man1
-+          MAN3DIR = $(MANUSR)/man/man3
- 
- /*
-  * MANPACKAGE is the directory inside of cat? or man? that man pages should
-@@ -281,22 +281,22 @@
-  * InstallManPageLong - misc changes for sgi.
-  */
- #define InstallManPageLong(file,destdir,dest)				@@\
--file.nr.z : file.man							@@\
-+file.nr.gz : file.man							@@\
- 	@if [ -f file.man ]; then \					@@\
--		$(RM) file.nr file.nr.z && \				@@\
-+		$(RM) file.nr file.nr.gz && \				@@\
- 		tbl file.man | eqn | nroff -man - > file.nr && \	@@\
--		pack -f file.nr; \					@@\
-+		$(GZIP_CMD) file.nr; \					@@\
- 	fi								@@\
- 									@@\
--install.man:: file.nr.z							@@\
-+install.man:: file.nr.gz						@@\
- 	MakeDir($(DESTDIR)destdir); \					@@\
- 	if [ -f file.man ]; then \					@@\
- 		$(INSTALL) -c $(INSTMANFLAGS) \				@@\
--			file.nr.z $(DESTDIR)destdir/dest.z; \		@@\
-+			file.nr.gz $(DESTDIR)destdir/dest.$(MANSUFFIX).gz; \	@@\
- 	fi								@@\
- 									@@\
- clean::									@@\
--	$(RM) file.nr file.nr.z
-+	$(RM) file.nr file.nr.gz
- 
- /*
-  * InstallManPageAliases - generate rules to install manual page aliases.
---- sgiLib.rules.orig	2006-09-10 10:29:23.000000000 +0200
-+++ sgiLib.rules	2006-09-09 21:06:23.000000000 +0200
-@@ -97,8 +97,8 @@
- 	$(INSTALL) -c $(INSTLIBFLAGS) Concat4(lib,libname,.so,rev) \	@@\
- 		$(DESTDIR)dest ; \					@@\
- 	STR=rev; if [ -n "$${STR}" ]; then \				@@\
--	    $(INSTALL) -c -l Concat4(lib,libname,.so,rev)  \		@@\
--		Concat3(lib,libname,.so) $(DESTDIR)dest ; \		@@\
-+	    $(LN) Concat4(lib,libname,.so,rev)  \			@@\
-+		$(DESTDIR)dest/Concat3(lib,libname,.so) ; \		@@\
- 	fi
- 
- /*
diff --git a/pkgtools/xpkgwedge/files/irix6.patch b/pkgtools/xpkgwedge/files/irix6.patch
deleted file mode 100644
index 7713d41764f..00000000000
--- a/pkgtools/xpkgwedge/files/irix6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: irix6.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
-
---- X11.rules.orig	Thu Jun 12 09:12:20 2003
-+++ X11.rules	Sun Jun  8 10:31:35 2003
-@@ -79,7 +79,7 @@
- #if UseInstalledX11 
- #if defined(X11ProjectRoot)
- # define X11BuildLibPath	$(XPROJECTROOT)/lib
--else
-+#else
- # define X11BuildLibPath        $(USRLIBDIR)
- #endif
- #elif ImportX11
---- sgi.cf.orig	Thu Jun 12 09:12:20 2003
-+++ sgi.cf		Sun Jun  8 12:55:50 2003
-@@ -241,7 +241,9 @@
-  * Actually, it doesn't matter what MakeCmd is, since we don't use it.
-  * We assume that $(MAKE) gets set for us by make.
-  */
-+#ifndef MakeCmd
- #define MakeCmd $(TOOLROOTSAFE) $(TOOLROOT)/sbin/make
-+#endif
- #define TroffCmd psroff -t
- 
- #define StandardIncludes -nostdinc -I$(ROOT)/usr/include
-@@ -320,10 +322,14 @@
- #define NroffFilemanDir $(MAN4DIR)$(MANPACKAGE)
- #define NroffMiscmanDir $(MAN5DIR)$(MANPACKAGE)
- 
-+#ifndef ManUsr
- #ifdef UseInstalled
-            MANUSR = /usr/share/local
- #else
-            MANUSR = /usr/share
-+#endif
-+#else
-+           MANUSR = ManUsr
- #endif
- 
-        CATMAN1DIR = $(MANUSR)/catman/u_man/cat1
diff --git a/pkgtools/xpkgwedge/files/pkgxmkmf.in b/pkgtools/xpkgwedge/files/pkgxmkmf.in
deleted file mode 100644
index c6166cd788d..00000000000
--- a/pkgtools/xpkgwedge/files/pkgxmkmf.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp
-# XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws
-#
-# $NetBSD: pkgxmkmf.in,v 1.6 2005/06/14 20:12:51 jlam Exp $
-#
-# make a Makefile from an Imakefile from inside or outside the sources
-# with support for config files in ${PREFIX}/lib/X11/config
-
-usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
-
-xcfgdir=@X11BASE@/lib/X11/config
-lcfgdir=@PREFIX@/lib/X11/config
-vcfgdir=@VIEWBASE@/lib/X11/config
-configdirspec=''
-if [ "${xcfgdir}" != "${lcfgdir}" -a -d ${lcfgdir} ]; then
-	configdirspec="${configdirspec} -I${lcfgdir}"
-fi
-if [ "${lcfgdir}" != "${vcfgdir}" -a -d ${vcfgdir} ]; then
-	configdirspec="${configdirspec} -I${vcfgdir}"
-fi
-configdirspec="${configdirspec} -I${xcfgdir}"
-
-topdir=
-curdir=.
-do_all=
-imake_defines=
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    -D*)
-	imake_defines="$imake_defines $1"
-	shift
-	;;
-    -a)
-	do_all="yes"
-	shift
-	;;
-    *)
-	break
-	;;
-    esac
-done
-
-case $# in 
-    0) ;;
-    1) topdir=$1 ;;
-    2) topdir=$1  curdir=$2 ;;
-    *) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-case "$topdir" in
-    -*) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-if [ -f Makefile ]; then 
-    echo mv -f Makefile Makefile.bak
-    mv -f Makefile Makefile.bak
-fi
-
-if [ "$topdir" = "" ]; then
-    args="-DUseInstalled "$configdirspec
-else
-    args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
-fi
-
-echo imake $imake_defines $args
-case "$do_all" in
-yes)
-    imake $imake_defines $args && 
-    echo "make Makefiles" &&
-    @MAKE@ Makefiles &&
-    echo "make includes" &&
-    @MAKE@ includes &&
-    echo "make depend" &&
-    @MAKE@ depend
-    ;;
-*)
-    imake $imake_defines $args
-    ;;
-esac
diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def
deleted file mode 100644
index def7cc1af7b..00000000000
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: xpkgwedge.def,v 1.13 2010/06/06 03:45:17 dholland Exp $	*/
-
-#ifdef BeforeVendorCF
-
-/*
- * OS-specific overrides for Interix to make it behave similarly to NetBSD
- * when creating binaries for pkgsrc.
- */
-#ifdef __INTERIX
-#undef  ForceNormalLib /* this is always YES on Interix */
-#define NullMakeCommand @ true
-#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH)
-
-#ifdef UseInstalled  
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#define LinkBuildSonameLibrary(lib) true
-#else
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-#endif
-
-/*
- * Oy, what a hack: see pkgsrc/devel/libtool for an explanation of the
- * bizarre --image-base option used below.
- */
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist					@@\
-	$(RM) $@~							@@\
-	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
-		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) \		@@\
-			-Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280)) \ @@\
-			-Wl,-h,$$SONAME solist $(REQUIREDLIBS)); \	@@\
-		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-		LinkBuildSonameLibrary($$SONAME)			@@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-	LinkBuildLibrary($@)						@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
-	set -x; $(RM) $$SONAME						@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(RM) Concat(lib,libname.so.rev)
-
-#define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\ @@\
-	  set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T	@@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-
-#endif /* __INTERIX && BeforeVendorCF */
-
-#endif /* BeforeVendorCF */
-
-#ifdef AfterVendorCF
-
-/*
- * The following defines inject a "PREFIX=" make-time option that lets the
- * user twiddle the ProjectRoot setting with a single switch.  This makes
- * the command "make PREFIX=/path/to/install all install" work as expected.
- */
-
-#ifndef ProjectRoot
-/*
- * Assume the worst:  this should not happen in practice, as this setup
- * does not work with the classical /usr/{include,lib}/X11 layout.
- */
-#define ProjectRoot /usr/X11
-#endif
-
-X11_ROOT = ProjectRoot
-
-#undef ProjectRoot
-#define ProjectRoot $(PREFIX)
-#undef ConfigDir
-#define ConfigDir $(X11_ROOT)/lib/X11/config
-
-/*
- * This emits dual -I and -L options to cc automatically, one for the actual
- * X11 root, and one for the user-set prefix.
- */
-#define X11ProjectRoot $(X11_ROOT)
-#define ExtraLoadFlags @X11TYPEFLAGS@
-
-/* 
- * InstallAppDefaultsLong - general rule to install application default file
- * if the InstallAppDefFiles configuration parameter is set.
- *
- * This is the same as the one in X11.tmpl, but without the LinkConfDirectory.
- * LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11
- * and creates a link to the real X11 app-defaults directory and moves the old
- * app-defaults files into it. This is not what we want for pkgsrc.
- */
-#ifndef InstallAppDefaultsLong
-#if InstallAppDefFiles
-#define InstallAppDefaultsLong(file,class)				@@\
-InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-#else
-#define InstallAppDefaultsLong(file,class)				@@\
-InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-#endif /* InstallAppDefFiles */
-#endif /* InstallAppDefaultsLong */
-
-#ifdef UseInstalled
-/*
- * We need to redefine ImakeCmd so that imake will look in both
- * $(PREFIX)/lib/X11/config and $(VIEWBASE)/lib/X11/config *before*
- * looking in the standard X11 config directory to override any
- * configuration files installed there.
- */
-#undef ImakeCmd
-#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config
-#endif
-
-#ifdef __linux__
-#if LinuxDistribution == LinuxDebian
-#undef ManPath
-#define ManPath $(PREFIX)/man
-#endif /* Debian */
-#endif /* __linux__ */
-
-#endif /* AfterVendorCF */