From 2e8f42087c52cbdcdb7421ad294e73d949e71e00 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Fri, 4 Sep 1998 09:28:04 +0000
Subject: Move xpkgwedge from x11 category to pkgtools category by Repository
 Copy.

---
 x11/Makefile                      |  3 +--
 x11/xpkgwedge/Makefile            | 41 ---------------------------------------
 x11/xpkgwedge/files/Imakefile     | 13 -------------
 x11/xpkgwedge/files/xpkgwedge.def | 36 ----------------------------------
 x11/xpkgwedge/pkg/COMMENT         |  1 -
 x11/xpkgwedge/pkg/DEINSTALL       | 19 ------------------
 x11/xpkgwedge/pkg/DESCR           |  3 ---
 x11/xpkgwedge/pkg/MESSAGE.pre     | 19 ------------------
 x11/xpkgwedge/pkg/PLIST           |  4 ----
 9 files changed, 1 insertion(+), 138 deletions(-)
 delete mode 100644 x11/xpkgwedge/Makefile
 delete mode 100644 x11/xpkgwedge/files/Imakefile
 delete mode 100644 x11/xpkgwedge/files/xpkgwedge.def
 delete mode 100644 x11/xpkgwedge/pkg/COMMENT
 delete mode 100755 x11/xpkgwedge/pkg/DEINSTALL
 delete mode 100644 x11/xpkgwedge/pkg/DESCR
 delete mode 100644 x11/xpkgwedge/pkg/MESSAGE.pre
 delete mode 100644 x11/xpkgwedge/pkg/PLIST

(limited to 'x11')

diff --git a/x11/Makefile b/x11/Makefile
index 668b6a88ab6..44c8244fbd1 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 1998/09/04 08:12:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.57 1998/09/04 09:28:04 agc Exp $
 # FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
 #
 
@@ -113,7 +113,6 @@
 #    SUBDIR += xmold
     SUBDIR += xmove
     SUBDIR += xneko
-#    SUBDIR += xpkgwedge # not for general consumption yet
     SUBDIR += xplot
     SUBDIR += xpmroot
     SUBDIR += xpns
diff --git a/x11/xpkgwedge/Makefile b/x11/xpkgwedge/Makefile
deleted file mode 100644
index 3c0dd1596f5..00000000000
--- a/x11/xpkgwedge/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.10 1998/08/23 21:25:19 frueauf Exp $
-#
-
-DISTNAME=	xpkgwedge-0.4
-CATEGORIES=	devel x11
-DISTFILES=	# none
-
-MAINTAINER=	tv@netbsd.org
-
-NO_CHECKSUM=	yes
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
-
-pre-extract:
-	@if [ ! -f ${X11BASE}/include/X11/X.h ]; then \
-		${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \
-		${ECHO} 'If you are setting this variable in mk.conf, fix or remove the setting'; \
-		${ECHO} 'and then install xpkgwedge.'; \
-		${FALSE}; \
-	fi
-
-pre-configure:
-	@${CP} ${FILESDIR}/Imakefile ${FILESDIR}/xpkgwedge.def ${WRKSRC}
-
-pre-install:
-	@${SED} -e 's|@@PREFIX@@|${LOCALBASE}|g' < ${PKGDIR}/MESSAGE.pre \
-		> ${PKGDIR}/MESSAGE
-
-pre-clean:
-	@${RM} -f ${PKGDIR}/MESSAGE
-
-.include "../../mk/bsd.pkg.mk"
-
-# In order to force xpkgwedge to install into X11BASE, we forcibly override
-# any user setting of USE_LOCALBASE_FOR_X11.  _NO_ other pkg should do this.
-PREFIX=${X11BASE}
-
-# Clear the build dependencies list so that xpkgwedge will not be recursively
-# dependent on itself.
-BUILD_DEPENDS=
diff --git a/x11/xpkgwedge/files/Imakefile b/x11/xpkgwedge/files/Imakefile
deleted file mode 100644
index c1bca3a885b..00000000000
--- a/x11/xpkgwedge/files/Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $NetBSD: Imakefile,v 1.2 1998/08/07 11:18:26 agc Exp $
-#
-# in case this hack is already installed
-X11_ROOT ?= ProjectRoot
-PREFIX = ${X11_ROOT}
-
-install::
-	${BSD_INSTALL_DATA} xpkgwedge.def ${CONFIGDIR}
-	@echo updating ${CONFIGDIR}/host.def
-	@echo '#include <xpkgwedge.def>' >${CONFIGDIR}/host.def.new
-	@grep -v xpkgwedge ${CONFIGDIR}/host.def >>${CONFIGDIR}/host.def.new || true
-	@mv -f ${CONFIGDIR}/host.def.new ${CONFIGDIR}/host.def
diff --git a/x11/xpkgwedge/files/xpkgwedge.def b/x11/xpkgwedge/files/xpkgwedge.def
deleted file mode 100644
index 904c0878542..00000000000
--- a/x11/xpkgwedge/files/xpkgwedge.def
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: xpkgwedge.def,v 1.2 1998/07/01 15:56:36 tv Exp $	*/
-
-#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.
- *
- * Note that ?= is a special Pmake construct and probably will not work on
- * other makes.
- */
-
-#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
-
-PREFIX ?= ProjectRoot
-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)
-
-#endif
diff --git a/x11/xpkgwedge/pkg/COMMENT b/x11/xpkgwedge/pkg/COMMENT
deleted file mode 100644
index b9e6c92a882..00000000000
--- a/x11/xpkgwedge/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Allows X11 pkgs to be built for installation outside of /usr/X11R6
diff --git a/x11/xpkgwedge/pkg/DEINSTALL b/x11/xpkgwedge/pkg/DEINSTALL
deleted file mode 100755
index 4360e642bea..00000000000
--- a/x11/xpkgwedge/pkg/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 1998/08/07 11:18:26 agc Exp $
-#
-
-case "$2" in
-	DEINSTALL) cat <<EOF
-
-===============================================================
-
-Note that you now need to remove the line which assigns X11BASE
-(such as X11BASE=\${LOCALBASE}) from your /etc/mk.conf!  If you
-do not remove that change, X11 pkgs will no longer build.
-
-===============================================================
-
-EOF
-	;;
-esac
diff --git a/x11/xpkgwedge/pkg/DESCR b/x11/xpkgwedge/pkg/DESCR
deleted file mode 100644
index 88f7a916216..00000000000
--- a/x11/xpkgwedge/pkg/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Xpkgwedge, not a "real" program in the traditional sense, is a hack that
-allows NetBSD users to compile X11 pkgs from pkgsrc and install them in
-/usr/pkg - even if they use Imake.
diff --git a/x11/xpkgwedge/pkg/MESSAGE.pre b/x11/xpkgwedge/pkg/MESSAGE.pre
deleted file mode 100644
index 90a40762e1c..00000000000
--- a/x11/xpkgwedge/pkg/MESSAGE.pre
+++ /dev/null
@@ -1,19 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.pre,v 1.2 1998/08/07 11:18:26 agc Exp $
-
-NOTES:
-
-- Add the following line in /etc/mk.conf to enable building of X pkgs into
-  the regular pkg binary tree:
-	X11BASE=${LOCALBASE}
-
-- 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.  The setting should point to: 
-	@@PREFIX@@/lib/X11/app-defaults
-
-  If any users set XAPPLRESDIR in their own environment, these settings
-  will not work - such users should instead append their own directories to
-  XAPPLRESDIR after a : character (similar to PATH).
-
-==============================================================================
diff --git a/x11/xpkgwedge/pkg/PLIST b/x11/xpkgwedge/pkg/PLIST
deleted file mode 100644
index 853216319da..00000000000
--- a/x11/xpkgwedge/pkg/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/31 19:30:49 tv Exp $
-lib/X11/config/xpkgwedge.def
-@exec echo "updating %D/lib/X11/config/host.def"; cp %D/lib/X11/config/host.def %D/lib/X11/config/host.def.bak; (grep -v xpkgwedge %D/lib/X11/config/host.def.bak; echo '#include <xpkgwedge.def>') >%D/lib/X11/config/host.def
-@unexec echo "updating %D/lib/X11/config/host.def"; cp %D/lib/X11/config/host.def %D/lib/X11/config/host.def.bak; (grep -v xpkgwedge %D/lib/X11/config/host.def.bak || true) >%D/lib/X11/config/host.def
-- 
cgit v1.2.3