summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorstacktic <stacktic@pkgsrc.org>2009-10-24 14:35:21 +0000
committerstacktic <stacktic@pkgsrc.org>2009-10-24 14:35:21 +0000
commit93f0d503ed88efe2fadc084f33f5c5484f3fe88a (patch)
tree72205035e5f53db7684474b3191df6409e05ab3b /misc
parent5f6c2f71b866172114b2c253f4a15129523930b2 (diff)
downloadpkgsrc-93f0d503ed88efe2fadc084f33f5c5484f3fe88a.tar.gz
Updated rump to version 20091024
- Avoid having to set the -m option in MAKEFLAGS - Use NetBSD's tsort
Diffstat (limited to 'misc')
-rw-r--r--misc/rump/Makefile60
-rw-r--r--misc/rump/distinfo8
2 files changed, 20 insertions, 48 deletions
diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index 3d155550c9a..50c17a26da4 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/10/20 10:01:00 stacktic Exp $
+# $NetBSD: Makefile,v 1.6 2009/10/24 14:35:21 stacktic Exp $
#
-DISTNAME= rump_20091014
+DISTNAME= rump_20091024
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 1
+
CATEGORIES= misc
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/
@@ -20,10 +20,16 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_BSD_MAKEFILE= yes
WRKSRC= ${WRKDIR}/rump
-MAKEFLAGS+= -m ${WRKSRC}/share/mk
+
MAKEFLAGS+= MKMAN=no
+
MAKEFLAGS+= TOOLDIR=${WRKSRC}/tooldir
MAKEFLAGS+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKEFLAGS+= BSDSRCDIR=${WRKSRC}
+
+MAKEFLAGS+= INSTALL=${WRKSRC}/tools/binstall/xinstall
+MAKEFLAGS+= TSORT="${WRKSRC}/tools/tsort/tsort -q"
+MAKEFLAGS+= LORDER=${WRKSRC}/bin/lorder
SUBST_CLASSES+= inc_path
SUBST_STAGE.inc_path= pre-configure
@@ -32,36 +38,9 @@ SUBST_FILES.inc_path= lib/libukfs/Makefile
SUBST_FILES.inc_path+= sys/rump/include/rump/Makefile
SUBST_SED.inc_path= -e "s|/usr/include|${PREFIX}/include|g"
-SUBST_CLASSES+= path
-SUBST_STAGE.path= pre-configure
-SUBST_MESSAGE.path= Adjusting path.
-SUBST_FILES.path= share/mk/bsd.own.mk
-SUBST_SED.path= -e "s|/usr/src|${WRKSRC}|g"
-SUBST_SED.path+= -e "s|NM.*lorder|${WRKSRC}/bin/lorder|g"
-SUBST_SED.path+= -e "s|^INSTALL=.*|INSTALL= ${WRKSRC}/tools/binstall/xinstall|g"
-
-SUBST_CLASSES+= install
-SUBST_STAGE.install= pre-configure
-SUBST_MESSAGE.install= Using NetBSD install
-SUBST_FILES.install= share/mk/sys.mk
-SUBST_SED.install= -e "s|^INSTALL?=.*|INSTALL=${WRKSRC}/tools/binstall/xinstall|g"
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
-SUBST_CLASSES+= linux
-SUBST_STAGE.linux= pre-configure
-SUBST_MESSAGE.linux= Adjusting tsort option.
-SUBST_FILES.linux= share/mk/sys.mk
-SUBST_SED.linux= -e "s|tsort -q|tsort|g"
-SUBST_SED.linux+= -e "s|lorder|${WRKSRC}/bin/lorder|g"
-
-SUBST_CLASSES+= strlc
-SUBST_STAGE.strlc= pre-configure
-SUBST_MESSAGE.strlc= Fixing strlcat/strlcpy definition.
-SUBST_FILES.strlc= lib/libukfs/Makefile
-SUBST_SED.strlc= -e "s|\#LIB.*|LDADD+= -L${WRKSRC}/tools/compat -lnbcompat|g"
-
MAKEFLAGS+= MACHINE=${MACHINE_ARCH:C/x86_64/amd64/}
CRT_PATH!= gcc --print-file-name=crtbegin.o
@@ -71,21 +50,14 @@ MAKEFLAGS+= _GCC_CRTEND=${CRT_PATH:C/begin/end/}
MAKEFLAGS+= _GCC_CRTENDS=${CRT_PATH:C/begin/endS/}
.endif
+RUMP_INCS= rump.h rump_compat.h rump_namei.h rump_syscalls.h
+RUMP_INCS+= rumpdefs.h rumpuser.h rumpvnode_if.h
+
post-install:
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rump.h \
- ${DESTDIR}${PREFIX}/include/rump
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rump_compat.h \
- ${DESTDIR}${PREFIX}/include/rump
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rump_namei.h \
- ${DESTDIR}${PREFIX}/include/rump
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rump_syscalls.h \
- ${DESTDIR}${PREFIX}/include/rump
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rumpdefs.h \
- ${DESTDIR}${PREFIX}/include/rump
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rumpuser.h \
- ${DESTDIR}${PREFIX}/include/rump
- ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/rumpvnode_if.h \
+.for i in ${RUMP_INCS}
+ ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/${i} \
${DESTDIR}${PREFIX}/include/rump
+.endfor
${INSTALL_DATA} ${WRKSRC}/lib/libukfs/ukfs.h \
${DESTDIR}${PREFIX}/include/rump
diff --git a/misc/rump/distinfo b/misc/rump/distinfo
index 172a9e252dc..a848c14e4e4 100644
--- a/misc/rump/distinfo
+++ b/misc/rump/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/14 13:26:10 stacktic Exp $
+$NetBSD: distinfo,v 1.2 2009/10/24 14:35:21 stacktic Exp $
-SHA1 (rump_20091014.tar.gz) = e425ce93d30490c1ff3c2fe56b33569c406cb479
-RMD160 (rump_20091014.tar.gz) = fa1be2df06d34325d7e4c757c40f73174a8acaa6
-Size (rump_20091014.tar.gz) = 56463039 bytes
+SHA1 (rump_20091024.tar.gz) = 8611ee9adb217c936fbfd72b933a777031e49e29
+RMD160 (rump_20091024.tar.gz) = 02913d424b6fede3aba56e96734c2f6f792d1d3a
+Size (rump_20091024.tar.gz) = 72573783 bytes