diff options
| -rw-r--r-- | pkgtools/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/DEINSTALL | 55 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/DESCR | 3 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/INSTALL | 58 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/Makefile | 53 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/PLIST | 4 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/files/buildlink-xmkmf.in | 71 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/files/buildlinkX11.def | 63 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/files/buildlinkX11.rules | 71 |
9 files changed, 1 insertions, 380 deletions
diff --git a/pkgtools/Makefile b/pkgtools/Makefile index 4ebbf3c4758..24fc2d4b015 100644 --- a/pkgtools/Makefile +++ b/pkgtools/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.39 2002/07/15 09:22:48 seb Exp $ +# $NetBSD: Makefile,v 1.40 2002/08/06 05:59:56 jlam Exp $ # COMMENT= Tools for use in the packages collection SUBDIR+= bsdpak -#SUBDIR+= buildlink-x11 # Only under instruction of user SUBDIR+= cdpack SUBDIR+= createbuildlink SUBDIR+= digest diff --git a/pkgtools/buildlink-x11/DEINSTALL b/pkgtools/buildlink-x11/DEINSTALL deleted file mode 100644 index 294da0cf323..00000000000 --- a/pkgtools/buildlink-x11/DEINSTALL +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 21:18:51 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CMP="@CMP@" -CP="@CP@" -ECHO="@ECHO@" -GREP="@GREP@" -MV="@MV@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -X11BASE=@X11BASE@ -X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def -HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def - -X11_X11_RULES=${X11BASE}/lib/X11/config/X11.rules -X11_RULES=${PKG_PREFIX}/lib/X11/config/X11.rules -X11_DIST_RULES=${PKG_PREFIX}/lib/X11/config/X11.dist.rules - -case ${STAGE} in -DEINSTALL) - ;; - -POST-DEINSTALL) - ${ECHO} -n "Updating ${HOSTDEF}..." - ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak - ( ${GREP} -v buildlinkX11 ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF} - ${RM} -f ${HOSTDEF}.bak - if [ ${PKG_PREFIX} != ${X11BASE} ] && \ - ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF} - then - ${RM} -f ${HOSTDEF} - fi - ${ECHO} "done." - - ${RM} -f ${X11_RULES} ${X11_DIST_RULES} - if [ ${PKG_PREFIX} = ${X11BASE} ] - then - ${MV} -f ${X11_X11_RULES}.buildlink.bak ${X11_X11_RULES} - fi - - ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/pkgtools/buildlink-x11/DESCR b/pkgtools/buildlink-x11/DESCR deleted file mode 100644 index 2b7b83fc322..00000000000 --- a/pkgtools/buildlink-x11/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -Buildlink-x11 is a hack that allows NetBSD users to compile X11 pkgs from -pkgsrc using the buildlink.mk infrastructure described in Packages.txt, -even if they use Imake. diff --git a/pkgtools/buildlink-x11/INSTALL b/pkgtools/buildlink-x11/INSTALL deleted file mode 100644 index df7711fc7de..00000000000 --- a/pkgtools/buildlink-x11/INSTALL +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/10/31 21:18:52 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CP="@CP@" -ECHO="@ECHO@" -GREP="@GREP@" -LN="@LN@" -MV="@MV@" -RM="@RM@" - -X11BASE=@X11BASE@ -X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def -HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def - -X11_X11_RULES=${X11BASE}/lib/X11/config/X11.rules -X11_RULES=${PKG_PREFIX}/lib/X11/config/X11.rules -X11_DIST_RULES=${PKG_PREFIX}/lib/X11/config/X11.dist.rules - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - ${RM} -f ${X11_DIST_RULES} - if [ ${PKG_PREFIX} = ${X11BASE} ] - then - ${MV} -f ${X11_X11_RULES} ${X11_X11_RULES}.buildlink.bak - ${LN} -sf ${X11_X11_RULES}.buildlink.bak ${X11_DIST_RULES} - else - ${LN} -sf ${X11_X11_RULES} ${X11_DIST_RULES} - fi - ${LN} -sf buildlinkX11.rules ${X11_RULES} - - if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ] - then - ${ECHO} -n "Updating ${HOSTDEF}..." - ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak - else - ${ECHO} -n "Creating ${HOSTDEF}..." - ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak - fi - ( ${GREP} -v buildlinkX11 ${HOSTDEF}.bak; \ - ${ECHO} '#include <buildlinkX11.def>'; \ - ) > ${HOSTDEF} - ${RM} -f ${HOSTDEF}.bak - ${ECHO} "done." - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile deleted file mode 100644 index 1f67b7c3405..00000000000 --- a/pkgtools/buildlink-x11/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:41 agc Exp $ - -DISTNAME= buildlink-x11-0.8 -CATEGORIES= pkgtools devel x11 -MASTER_SITES= # empty -DISTFILES= # empty - -MAINTAINER= jlam@netbsd.org -HOMEPAGE= ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt -COMMENT= allows X11 pkgs to be built using the buildlink.mk infrastructure - -EXTRACT_ONLY= # empty -NO_CHECKSUM= # defined -WRKSRC= ${WRKDIR} -NO_CONFIGURE= # defined -NO_MTREE= # defined -USE_X11BASE= # defined - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= X11BASE=${X11BASE} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= ECHO=${ECHO:Q} -FILES_SUBST+= GREP=${GREP:Q} -FILES_SUBST+= LN=${LN:Q} -FILES_SUBST+= MV=${MV:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} - -pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} - -do-build: - ${SED} ${FILES_SUBST_SED} \ - ${FILESDIR}/buildlink-xmkmf.in > ${WRKSRC}/buildlink-xmkmf - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config - ${INSTALL_DATA} ${FILESDIR}/buildlinkX11.def ${PREFIX}/lib/X11/config - ${INSTALL_DATA} ${FILESDIR}/buildlinkX11.rules ${PREFIX}/lib/X11/config - ${INSTALL_SCRIPT} ${WRKSRC}/buildlink-xmkmf \ - ${PREFIX}/bin/buildlink-xmkmf - -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - -.include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/buildlink-x11/PLIST b/pkgtools/buildlink-x11/PLIST deleted file mode 100644 index e4b80b4b0cd..00000000000 --- a/pkgtools/buildlink-x11/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:18:52 zuntum Exp $ -bin/buildlink-xmkmf -lib/X11/config/buildlinkX11.def -lib/X11/config/buildlinkX11.rules diff --git a/pkgtools/buildlink-x11/files/buildlink-xmkmf.in b/pkgtools/buildlink-x11/files/buildlink-xmkmf.in deleted file mode 100644 index f5316cb9fc3..00000000000 --- a/pkgtools/buildlink-x11/files/buildlink-xmkmf.in +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# XConsortium: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws -# -# $NetBSD: buildlink-xmkmf.in,v 1.1 2001/07/05 04:47:28 jlam Exp $ -# -# make a Makefile from an Imakefile from inside or outside the sources -# with support for passing -D options through to imake - -usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" - -configdirspec="-I@X11BASE@/lib/X11/config" -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/buildlink-x11/files/buildlinkX11.def b/pkgtools/buildlink-x11/files/buildlinkX11.def deleted file mode 100644 index fb75c9b9590..00000000000 --- a/pkgtools/buildlink-x11/files/buildlinkX11.def +++ /dev/null @@ -1,63 +0,0 @@ -/* $NetBSD: buildlinkX11.def,v 1.3 2001/08/22 17:45:57 jlam Exp $ */ - -#ifdef AfterVendorCF - -#ifdef UseInstalled -# ifdef BuildLink - -/* - * Force the buildlink include and lib directories to the head of the - * compiler search paths. The include directory is added through the - * C{,plusplus}DebugFlags, which are the first options given to the - * compiler. The following variables should be defined in the environment: - * - * BUILDLINK_DIR the location of 3rd-party software - * BUILDLINK_X11_DIR the location of the X11R6 hierarchy - */ - -# ifndef BuildLinkCppFlags -# define BuildLinkCppFlags -I$(BUILDLINK_DIR)/include $(PKGSRC_CPPFLAGS) -# endif -# ifndef BuildLinkLdFlags -# define BuildLinkLdFlags -L$(BUILDLINK_DIR)/lib $(PKGSRC_LDFLAGS) -# endif -# ifndef BuildLinkImakeCmd -# ifdef X11ProjectRoot -# define ImakeConfigDir -I$(PREFIX)/lib/X11/config -# else -# define ImakeConfigDir /**/ -# endif -# ifdef BuildLinkX11 -# define BuildLinkImakeCmd imake -DBuildLink -DBuildLinkX11 ImakeConfigDir -# else -# define BuildLinkImakeCmd imake -DBuildLink ImakeConfigDir -# endif -# endif -# ifdef DependFlags -# undef DependFlags -# endif -# define DependFlags BuildLinkCppFlags -# ifdef OptimizedCDebugFlags -# undef OptimizedCDebugFlags -# endif -# define OptimizedCDebugFlags -O2 BuildLinkCppFlags $(PKGSRC_CFLAGS) -# ifdef OptimizedCplusplusDebugFlags -# undef OptimizedCplusplusDebugFlags -# endif -# define OptimizedCplusplusDebugFlags -O2 BuildLinkCppFlags $(PKGSRC_CXXFLAGS) -# ifdef LdPreLib -# undef LdPreLib -# endif -# define LdPreLib BuildLinkLdFlags -# ifdef LdPostLib -# undef LdPostLib -# endif -# define LdPostLib BuildLinkLdFlags -# ifdef ImakeCmd -# undef ImakeCmd -# endif -# define ImakeCmd BuildLinkImakeCmd -# endif /* BuildLink */ -#endif /* UseInstalled */ - -#endif /* AfterVendorCF */ diff --git a/pkgtools/buildlink-x11/files/buildlinkX11.rules b/pkgtools/buildlink-x11/files/buildlinkX11.rules deleted file mode 100644 index accda298593..00000000000 --- a/pkgtools/buildlink-x11/files/buildlinkX11.rules +++ /dev/null @@ -1,71 +0,0 @@ -/* $NetBSD: buildlinkX11.rules,v 1.4 2001/08/22 17:45:57 jlam Exp $ */ - -#include <X11.dist.rules> - -#ifdef UseInstalled -# ifdef BuildLink -# ifdef TopInclude -# undef TopInclude -# endif -# define TopInclude -I$(BUILDLINK_DIR)/include -# ifdef BuildLinkX11 -# ifdef TopXInclude -# undef TopXInclude -# endif -# define TopXInclude -I$(BUILDLINK_X11_DIR)/include -# ifdef XLdPreLibs -# undef XLdPreLibs -# endif -# define XLdPreLibs -L$(BUILDLINK_X11_DIR)/lib -# ifdef LdPreLibs -# undef LdPreLibs -# endif -# define LdPreLibs LdPreLib XLdPreLibs -# ifdef XLdPostLibs -# undef XLdPostLibs -# endif -# define XLdPostLibs -L$(BUILDLINK_X11_DIR)/lib -# ifdef LdPostLibs -# undef LdPostLibs -# endif -# define LdPostLibs LdPostLib XLdPostLibs -# else -# ifdef TopXInclude -# undef TopXInclude -# endif -# ifdef X11ProjectRoot -# define TopXInclude -I$(XPROJECTROOT)/include -# else -# define TopXInclude -I$(INCROOT) -# endif -# ifdef XLdPreLibs -# undef XLdPreLibs -# endif -# ifdef X11ProjectRoot -# define XLdPreLibs -L$(XPROJECTROOT)/lib -# else -# define XLdPreLibs -L$(USRLIBDIR) -# endif -# ifdef LdPreLibs -# undef LdPreLibs -# endif -# define LdPreLibs LdPreLib XLdPreLibs -# ifdef XLdPostLibs -# undef XLdPostLibs -# endif -# ifdef X11ProjectRoot -# define XLdPostLibs -L$(XPROJECTROOT)/lib -# else -# define XLdPostLibs -L$(USRLIBDIR) -# endif -# ifdef LdPostLibs -# undef LdPostLibs -# endif -# define LdPostLibs LdPostLib XLdPostLibs -# endif /* BuildLinkX11 */ -# ifdef TopIncludes -# undef TopIncludes -# endif -# define TopIncludes TopInclude $(TOP_X_INCLUDES) -# endif /* BuildLink */ -#endif /* UseInstalled */ |