Date: Wed, 6 Apr 2005 10:04:08 -0700 From: Brooks Davis <brooks@one-eyed-alien.net> To: Brooks Davis <brooks@one-eyed-alien.net> Cc: freebsd-amd64@freebsd.org Subject: Re: [patch|test] CVSup/amd64 Message-ID: <20050406170408.GB20890@odin.ac.hmc.edu> In-Reply-To: <20050406170152.GA20890@odin.ac.hmc.edu> References: <Pine.BSF.4.53.0504051754330.81515@e0-0.zab2.int.zabbadoz.net> <20050406170152.GA20890@odin.ac.hmc.edu>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Wed, Apr 06, 2005 at 10:01:52AM -0700, Brooks Davis wrote: > On Tue, Apr 05, 2005 at 06:13:14PM +0000, Bjoern A. Zeeb wrote: > > Hi, > > > > attached patch also available at > > http://sources.zabbadoz.net/freebsd/ports/experimental/cvsup-amd64.diff > > updates binary only port for amd64. > > This patch didn't quite apply for me, but I was able to apply it by > hand. The following is what I used. Oops, forgot to actually attach. -- Brooks Index: Makefile =================================================================== RCS file: /storage/mirrors/freebsd/cvs/ports/net/cvsup/Makefile,v retrieving revision 1.59 diff -u -r1.59 Makefile --- Makefile 27 Mar 2005 19:12:22 -0000 1.59 +++ Makefile 6 Apr 2005 16:49:59 -0000 @@ -32,13 +32,14 @@ .if ${ARCH} == "alpha" TARGET= FBSD_ALPHA .elif ${ARCH} == "amd64" -PORTREVISION= 1 -MASTER_SITE_SUBDIR= obrien +PORTREVISION= 2 +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 +61,9 @@ .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 +72,10 @@ 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,7 +87,8 @@ @${INSTALL_DATA} ${WRKSRC}/License ${PREFIX}/share/cvsup/License .if ${ARCH} == "amd64" -PROGS= bin/cvsup sbin/cvsupd bin/cvpasswd +do-patch: + @${TRUE} do-patch: @${TRUE} @@ -92,18 +96,17 @@ 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: /storage/mirrors/freebsd/cvs/ports/net/cvsup/distinfo,v retrieving revision 1.24 diff -u -r1.24 distinfo --- distinfo 11 Oct 2004 22:10:58 -0000 1.24 +++ distinfo 5 Apr 2005 18:31:38 -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 -- Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCVBZyXY6L6fI4GtQRAtpqAKCyddt0ONhZar7+V3CZkwH+SZNKQACfbmwJ McI7qyjgPEY84FPtYG5r+74= =pDyf -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050406170408.GB20890>