From 1c57323789a922a7182ba378831f2c0a336a6959 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 25 Aug 2002 21:48:57 +0000 Subject: Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. --- emulators/suse_base/Makefile | 3 ++- emulators/suse_base/PLIST | 2 +- emulators/suse_compat/Makefile | 3 ++- emulators/suse_libjpeg/Makefile | 3 ++- emulators/suse_libpng/Makefile | 3 ++- emulators/suse_x11/Makefile | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) (limited to 'emulators') diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile index 23ad4be1407..237a056f8c7 100644 --- a/emulators/suse_base/Makefile +++ b/emulators/suse_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2002/04/04 09:46:54 tron Exp $ +# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:48 jlam Exp $ DISTNAME= suse_base-${SUSE_VERSION} CATEGORIES= emulators @@ -13,6 +13,7 @@ COMMENT= Linux compatibility package CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 ONLY_FOR_PLATFORM= NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386 +USE_BUILDLINK2= # defined EXTRACT_ONLY= # empty PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/suse_base/PLIST b/emulators/suse_base/PLIST index 098c8cd9eb3..a8091a8d265 100644 --- a/emulators/suse_base/PLIST +++ b/emulators/suse_base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:41 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:49:48 jlam Exp $ sbin/linux-mkpwd @unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache @@EMULSUBDIR@@/etc/ld.so.conf diff --git a/emulators/suse_compat/Makefile b/emulators/suse_compat/Makefile index a597039aae4..5b2c27220b6 100644 --- a/emulators/suse_compat/Makefile +++ b/emulators/suse_compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/04/04 09:46:55 tron Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:49:49 jlam Exp $ DISTNAME= compat PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base ONLY_FOR_PLATFORM= NetBSD-*-i386 +USE_BUILDLINK2= # defined EXTRACT_ONLY= # empty NO_BUILD= YES PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/suse_libjpeg/Makefile b/emulators/suse_libjpeg/Makefile index ef3eaae63fd..3dc65db42a8 100644 --- a/emulators/suse_libjpeg/Makefile +++ b/emulators/suse_libjpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/04/04 09:47:04 tron Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:49 jlam Exp $ DISTNAME= libjpeg PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base ONLY_FOR_PLATFORM= NetBSD-*-i386 +USE_BUILDLINK2= # defined EXTRACT_ONLY= # empty NO_BUILD= YES PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/suse_libpng/Makefile b/emulators/suse_libpng/Makefile index 4c86b39fd37..ef95aaa0efc 100644 --- a/emulators/suse_libpng/Makefile +++ b/emulators/suse_libpng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/04 09:47:06 tron Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:49:50 jlam Exp $ DISTNAME= libpng PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base ONLY_FOR_PLATFORM= NetBSD-*-i386 +USE_BUILDLINK2= # defined EXTRACT_ONLY= # empty NO_BUILD= YES PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/suse_x11/Makefile b/emulators/suse_x11/Makefile index 9e8ffee4c3b..ad874ad7896 100644 --- a/emulators/suse_x11/Makefile +++ b/emulators/suse_x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/04/07 17:00:13 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 21:49:50 jlam Exp $ DISTNAME= suse_x11-${SUSE_VERSION} PKGREVISION= 2 @@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base ONLY_FOR_PLATFORM= NetBSD-*-i386 +USE_BUILDLINK2= # defined EXTRACT_ONLY= # empty NO_BUILD= YES PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -- cgit v1.2.3