From bdd99878f055b1517894541cea629b6bbbf86b92 Mon Sep 17 00:00:00 2001 From: hubertf Date: Thu, 14 Dec 2000 16:45:01 +0000 Subject: Update to 0.20001214.2 - the NetBSD changes are now in the anoncvs repository. Uses new tarball from there. While there, pull in bsd.prefs.mk so BSDSRCDIR has a chance to be defined. --- emulators/plex86/Makefile | 27 ++++++++------------------- emulators/plex86/files/md5 | 5 ++--- emulators/plex86/patches/patch-aa | 13 ------------- 3 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 emulators/plex86/patches/patch-aa diff --git a/emulators/plex86/Makefile b/emulators/plex86/Makefile index 1e74ad60263..bb1e6ae769f 100644 --- a/emulators/plex86/Makefile +++ b/emulators/plex86/Makefile @@ -1,27 +1,25 @@ -# $NetBSD: Makefile,v 1.5 2000/12/14 15:53:33 tv Exp $ +# $NetBSD: Makefile,v 1.6 2000/12/14 16:45:01 hubertf Exp $ # -DISTNAME= plex86 -PKGNAME= plex86-0.20001214 +DISTNAME= plex86-20001214.2 +PKGNAME= plex86-0.20001214.2 CATEGORIES= emulators -MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/fvdl/ \ - ${MASTER_SITE_LOCAL} -DISTFILES= plex86-20001214.tgz plex86.tgz +MASTER_SITES= ${MASTER_SITE_LOCAL} +EXTRACT_SUFX= .tgz MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.plex86.org/ -BUILD_DEPENDS+= autoconf:../../devel/autoconf - -DIST_SUBDIR= plex86-20001214 WRKSRC= ${WRKDIR}/plex86 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-NetBSD \ - --with-netbsd-source=${BSDSRCDIR} + --with-netbsd-source=${BSDSRCDIR}/sys USE_GMAKE= yes NO_PKG_REGISTER= yes # ONLY until we really install files!!! NO_PACKAGE= Incomplete # ONLY until we really install files!!! +.include "../../mk/bsd.prefs.mk" + BSDSRCDIR?= /nonexistent # (to override ) .include "../../mk/bsd.prefs.mk" @@ -36,15 +34,6 @@ pre-extract: @${FALSE} .endif -pre-patch: - cd ${WRKSRC} && \ - ${PATCH} ${PATCH_ARGS} <${WRKDIR}/plex86.diff - ${CP} ${WRKDIR}/kernel/host-netbsd.c ${WRKSRC}/kernel - ${CP} ${WRKDIR}/misc/netbsd_post.sh ${WRKSRC}/misc - -pre-configure: - cd ${WRKSRC} && autoconf - do-install: @${CAT} ${MESSAGE_FILE} @${ECHO_MSG} Package NOT recorded as installed! diff --git a/emulators/plex86/files/md5 b/emulators/plex86/files/md5 index cf530f565e3..6339142cc5b 100644 --- a/emulators/plex86/files/md5 +++ b/emulators/plex86/files/md5 @@ -1,4 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/12/14 04:25:52 hubertf Exp $ +$NetBSD: md5,v 1.2 2000/12/14 16:45:01 hubertf Exp $ -MD5 (plex86-20001214/plex86-20001214.tgz) = 73962c5a8946a2fbc6630244f97c965a -MD5 (plex86-20001214/plex86.tgz) = f9fe0a3928ef9b79c14f1d9c027dc63c +MD5 (plex86-20001214.2.tgz) = ff05fb652f3a1bb42176442d18aed43b diff --git a/emulators/plex86/patches/patch-aa b/emulators/plex86/patches/patch-aa deleted file mode 100644 index c67a369f156..00000000000 --- a/emulators/plex86/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2000/12/14 16:40:57 tsarna Exp $ - ---- kernel/host-netbsd.c.orig Thu Dec 14 05:49:45 2000 -+++ kernel/host-netbsd.c -@@ -25,7 +25,7 @@ - - #undef NETBSD_PLEX86_DEBUG - --#if __NetBSD_Version__ > 105000000 -+#if __NetBSD_Version__ > 105000100 - #include - #include - #else -- cgit v1.2.3