summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-05-26 11:45:24 +0000
committerjoerg <joerg@pkgsrc.org>2006-05-26 11:45:24 +0000
commit994f0ecabf823044eae293dab4ba7b8d4cb5afe7 (patch)
tree283170e184ba1fb85a8f4de0c2b08fb51f335987
parentf9aa6e877e587956d1f3173a86feb67c1d619871 (diff)
downloadpkgsrc-994f0ecabf823044eae293dab4ba7b8d4cb5afe7.tar.gz
Also remove /dev/fd from emul/linux, since DragonFly's MAKEDEV creates
it. Bump revision for this. Set a number of CHECK_FILES_SKIP entries to let the package pass CHECK_FILES.
-rw-r--r--emulators/suse_base/Makefile13
-rw-r--r--emulators/suse_base/PLIST3
2 files changed, 13 insertions, 3 deletions
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index 7808553d500..56575d3b078 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2006/03/14 01:14:28 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2006/05/26 11:45:24 joerg Exp $
DISTNAME= suse_base-${SUSE_VERSION}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE:=a1/} \
${MASTER_SITE_SUSE_UPD:=a1/}
@@ -21,6 +21,15 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= aaa_dir.rpm gppshare.rpm ncurses.rpm \
readline.rpm bash.rpm sh-utils.rpm
+# these files are handled by manually during de-/installation/pkg_add
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.*
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/rc.d
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/cdrom
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/floppy
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/usr/lib/X11
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/usr/spool
+
.include "../../emulators/suse_linux/arch.mk"
.if ${SUSE_ARCH} == "i386"
diff --git a/emulators/suse_base/PLIST b/emulators/suse_base/PLIST
index 755fb16ffe0..1a473e8af16 100644
--- a/emulators/suse_base/PLIST
+++ b/emulators/suse_base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/09/10 21:53:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/05/26 11:45:24 joerg Exp $
sbin/linux-mkpwd
@unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
@@EMULSUBDIR@@/etc/SuSE-release
@@ -8,5 +8,6 @@ sbin/linux-mkpwd
@exec cp -p /dev/MAKEDEV %D/@@EMULSUBDIR@@/dev
@exec cd %D/@@EMULSUBDIR@@/dev && sh ./MAKEDEV std audio
@exec cd %D/@@EMULSUBDIR@@/dev && ln -s sound dsp
+@unexec ${RMDIR} %D/@@EMULSUBDIR@@/dev/fd || ${TRUE}
@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/*
@dirrm @@EMULSUBDIR@@/dev