Convert cvsup-bin and cvsup-gui-bin to the emulator framework. This

should allow running these packages on NetBSD/amd64.

Bump the PKGREVISION of cvsup-gui-bin after changing the dependency to
require at least the same version of cvsup-bin.

4 files changed, 42 insertions, 29 deletions

diff --git a/devel/cvsup-bin/MESSAGE.NetBSD b/devel/cvsup-bin/MESSAGE.NetBSD
index a16aa8d6bc3..066bf5998f2 100644
--- a/devel/cvsup-bin/MESSAGE.NetBSD
+++ b/devel/cvsup-bin/MESSAGE.NetBSD
@@ -1,7 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2004/01/05 23:50:20 xtraeme Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.2 2007/08/22 18:09:12 jlam Exp $
 
-IMPORTANT: Make sure your kernel has COMPAT_43, COMPAT_13, and COMPAT_14
-defined.
+In order to use ${PKGNAME}, you must have the following options
+built into your kernel:
+
+	COMPAT_43, COMPAT_13, COMPAT_14
 
 ===========================================================================
diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile
index 320893c1eff..e90fde81827 100644
--- a/devel/cvsup-bin/Makefile
+++ b/devel/cvsup-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/17 20:59:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/08/22 18:09:12 jlam Exp $
 
 DISTNAME=	cvsup-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
@@ -10,29 +10,32 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~jdp/
 COMMENT=	cvsup daemon and client
 
-WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
-# remove on next update -- see PR 25255 for details
-DIST_SUBDIR=	cvsup-i386-1.6
-
 CONFLICTS=	cvsup-[0-9]* cvsup-gui-[0-9]*
 
+EMUL_PLATFORMS=		netbsd-i386
+NETBSD_VERSION_REQD=	1.5
+
+# XXX Remove the following line on the next update; see PR 25255 for details
+DIST_SUBDIR=		cvsup-i386-1.6
+
+WRKSRC=			${WRKDIR}
+NO_CONFIGURE=		yes
+BUILD_DIRS=		# empty
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 sbin
 
 do-install:
-	for i in cvpasswd cvsup ; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/bin/$$i ${PREFIX}/bin; \
+	cd ${WRKSRC} && for i in cvpasswd cvsup ; do \
+		${INSTALL_PROGRAM} bin/$$i ${PREFIX}/bin; \
 	done
-	for i in cvsupd; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/sbin/$$i ${PREFIX}/sbin; \
+	cd ${WRKSRC} && for i in cvsupd; do \
+		${INSTALL_PROGRAM} sbin/$$i ${PREFIX}/sbin; \
 	done
-	for i in cvpasswd.1 cvsup.1; do \
-		${INSTALL_MAN} ${WRKSRC}/man/man1/$$i ${PREFIX}/${PKGMANDIR}/man1; \
+	cd ${WRKSRC} && for i in cvpasswd.1 cvsup.1; do \
+		${INSTALL_MAN} man/man1/$$i ${PREFIX}/${PKGMANDIR}/man1; \
 	done
-	for i in cvsupd.8; do \
-		${INSTALL_MAN} ${WRKSRC}/man/man8/$$i ${PREFIX}/${PKGMANDIR}/man8; \
+	cd ${WRKSRC} && for i in cvsupd.8; do \
+		${INSTALL_MAN} man/man8/$$i ${PREFIX}/${PKGMANDIR}/man8; \
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cvsup
 	${INSTALL_DATA} ${WRKSRC}/share/doc/cvsup/License \
diff --git a/devel/cvsup-gui-bin/MESSAGE.NetBSD b/devel/cvsup-gui-bin/MESSAGE.NetBSD
index 12c46d78f12..066bf5998f2 100644
--- a/devel/cvsup-gui-bin/MESSAGE.NetBSD
+++ b/devel/cvsup-gui-bin/MESSAGE.NetBSD
@@ -1,6 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2004/01/05 23:51:02 xtraeme Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.2 2007/08/22 18:09:12 jlam Exp $
 
-IMPORTANT: make sure your kernel has COMPAT_13 and COMPAT_14 defined!
+In order to use ${PKGNAME}, you must have the following options
+built into your kernel:
+
+	COMPAT_43, COMPAT_13, COMPAT_14
 
 ===========================================================================
diff --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile
index 78c7db1dbb1..a3d24b79a68 100644
--- a/devel/cvsup-gui-bin/Makefile
+++ b/devel/cvsup-gui-bin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:21 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/08/22 18:09:12 jlam Exp $
 
 DISTNAME=	cvsup-gui-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
+PKGREVISION=	1
 CATEGORIES=	devel scm
 MASTER_SITES=	http://motoyuki.bsdclub.org/data/NetBSD/CVSup/i386/
 EXTRACT_SUFX=	.tgz
@@ -10,15 +11,19 @@ MAINTAINER=	motoyuki@bsdclub.org
 HOMEPAGE=	http://www.cvsup.org/
 COMMENT=	cvsup GUI client
 
-DEPENDS+=	cvsup-bin-[0-9]*:../../devel/cvsup-bin
+CVSUP_VERSION=	${DISTNAME:S/cvsup-gui-static-//}
 
-WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-# remove on next update -- see PR 25255 for details
-DIST_SUBDIR=	cvsup-i386-1.6
+DEPENDS+=	cvsup-bin>=${CVSUP_VERSION}:../../devel/cvsup-bin
 
-ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
+EMUL_PLATFORMS=		netbsd-i386
+NETBSD_VERSION_REQD=	1.5
+
+# XXX Remove the following line on next update; see PR 25255 for details
+DIST_SUBDIR=		cvsup-i386-1.6
+
+WRKSRC=			${WRKDIR}
+NO_CONFIGURE=		yes
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin