[patch|test] CVSup/amd64

[Bjoern A. Zeeb]

Hi,

attached patch also available at
http://sources.zabbadoz.net/freebsd/ports/experimental/cvsup-amd64.diff
updates binary only port for amd64.

It should give you everything (this incl. cvsupd etc., with
compression working) but it hasn't been tested at all.
It has been built in a 5.4-PRERELEASE chroot.

I'd like any reports if this works ok on amd64 or if it
breaks ports building for other archs.

It has been built with the sources/patches posted to amd64 list
several months ago.

-- 
Greetings
Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT

--- 8< 8< 8< ---
Index: Makefile
===================================================================
RCS file: /local/mirror/FreeBSD/r/pcvs/ports/net/cvsup/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile	27 Mar 2005 19:12:22 -0000	1.59
+++ Makefile	2 Apr 2005 21:29:52 -0000
@@ -32,13 +32,13 @@ BROKEN=		Not supported on versions earli
 .if ${ARCH} == "alpha"
 TARGET=		FBSD_ALPHA
 .elif ${ARCH} == "amd64"
-PORTREVISION=	1
-MASTER_SITE_SUBDIR=	obrien
+MASTER_SITE_SUBDIR=	bz
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTNAME=	cvsup-without-gui.amd64
 NO_WRKSUBDIR=	yes
 USE_REINPLACE=	yes
 NO_BUILD=	binary-only
+MANCOMPRESSED=	yes
 .elif ${ARCH} == "i386"
 TARGET=		FreeBSD4
 .elif ${ARCH} == "sparc64"
@@ -60,11 +60,9 @@ BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/form
 .endif		# != amd64
 .endif

-.if ${ARCH} != "amd64"
 MAKE_ARGS+=	PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
 MAN1=		cvpasswd.1 cvsup.1
 MAN8=		cvsupd.8
-.endif		# != amd64

 .ifdef STATIC
 M3FLAGS+=	-DSTATIC
@@ -73,6 +71,10 @@ M3FLAGS+=	-DSTATIC
 pre-fetch:
 .ifndef WITHOUT_X11
 	@${ECHO_MSG} "*****************************************************"
+.if ${ARCH} == "amd64"
+	@${ECHO_MSG} "* CVSup with X11 not yet supported on amd64.        *"
+	@${ECHO_MSG} "* Will install non-X11 version. You might want      *"
+.endif
 	@${ECHO_MSG} "* To build CVSup without X11 (and without the GUI), *"
 	@${ECHO_MSG} "* use the \"net/cvsup-without-gui\" port.             *"
 	@${ECHO_MSG} "*****************************************************"
@@ -84,26 +86,23 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/License ${PREFIX}/share/cvsup/License

 .if ${ARCH} == "amd64"
-PROGS=	bin/cvsup sbin/cvsupd bin/cvpasswd
-
 do-patch:
 	@${TRUE}

 do-configure:
 	@${TOUCH} ${WRKSRC}/License
 	@${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
+	@${TRUE}

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cvsup-without-gui.amd64 ${PREFIX}/bin/cvsup
-	@${ECHO} '#! /bin/sh'	> ${PREFIX}/sbin/cvsupd
-	@${ECHO} 'echo `basename $$0` not supported on `uname -m`' \
-		>> ${PREFIX}/sbin/cvsupd
-	@${ECHO} '#! /bin/sh'	> ${PREFIX}/bin/cvpasswd
-	@${ECHO} 'echo `basename $$0` not supported on `uname -m`' \
-		>> ${PREFIX}/sbin/cvpasswd
-	cd ${PREFIX} ; \
-		${CHOWN} ${BINOWN}:${BINGRP} ${PROGS} ; \
-		${CHMOD} ${BINMODE} ${PROGS}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cvpasswd ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cvsup ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/sbin/cvsupd ${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/man/man1/cvpasswd.1.gz ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/man/man1/cvsup.1.gz ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/man/man8/cvsupd.8.gz ${PREFIX}/man/man8/
+	${MKDIR} ${PREFIX}/share/cvsup
+	${MV} ${WRKSRC}/share/cvsup/License ${WRKSRC}/License
 .endif

 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /local/mirror/FreeBSD/r/pcvs/ports/net/cvsup/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo	11 Oct 2004 22:10:58 -0000	1.24
+++ distinfo	2 Apr 2005 21:29:52 -0000
@@ -1,4 +1,4 @@
 MD5 (cvsup-snap-16.1h.tar.gz) = b100ace98a41aa9f3d3e75b0d3c245b0
 SIZE (cvsup-snap-16.1h.tar.gz) = 430951
-MD5 (cvsup-without-gui.amd64.tar.bz2) = 5e83e6b68696058ebcc4e8666e8442a9
-SIZE (cvsup-without-gui.amd64.tar.bz2) = 335735
+MD5 (cvsup-without-gui.amd64.tar.bz2) = ced3a5ccca76550d239f1ec09e3822d4
+SIZE (cvsup-without-gui.amd64.tar.bz2) = 964594