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>
next in thread | previous in thread | raw e-mail | index | archive | help
--s/l3CgOIzMHHjg/5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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, > >=20 > > attached patch also available at > > http://sources.zabbadoz.net/freebsd/ports/experimental/cvsup-amd64.diff > > updates binary only port for amd64. >=20 > 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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} =3D=3D "alpha" TARGET=3D FBSD_ALPHA .elif ${ARCH} =3D=3D "amd64" -PORTREVISION=3D 1 -MASTER_SITE_SUBDIR=3D obrien +PORTREVISION=3D 2 +MASTER_SITE_SUBDIR=3D bz MASTER_SITES=3D ${MASTER_SITE_LOCAL} DISTNAME=3D cvsup-without-gui.amd64 NO_WRKSUBDIR=3D yes USE_REINPLACE=3D yes NO_BUILD=3D binary-only +MANCOMPRESSED=3D yes .elif ${ARCH} =3D=3D "i386" TARGET=3D FreeBSD4 .elif ${ARCH} =3D=3D "sparc64" @@ -60,11 +61,9 @@ .endif # !=3D amd64 .endif =20 -.if ${ARCH} !=3D "amd64" MAKE_ARGS+=3D PREFIX=3D${PREFIX} M3FLAGS=3D"${M3FLAGS}" MAN1=3D cvpasswd.1 cvsup.1 MAN8=3D cvsupd.8 -.endif # !=3D amd64 =20 .ifdef STATIC M3FLAGS+=3D -DSTATIC @@ -73,6 +72,10 @@ pre-fetch: .ifndef WITHOUT_X11 @${ECHO_MSG} "*****************************************************" +.if ${ARCH} =3D=3D "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 =20 .if ${ARCH} =3D=3D "amd64" -PROGS=3D bin/cvsup sbin/cvsupd bin/cvpasswd +do-patch: + @${TRUE} =20 do-patch: @${TRUE} @@ -92,18 +96,17 @@ do-configure: @${TOUCH} ${WRKSRC}/License @${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE} + @${TRUE} =20 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 =20 .include <bsd.port.post.mk> Index: distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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) =3D b100ace98a41aa9f3d3e75b0d3c245b0 SIZE (cvsup-snap-16.1h.tar.gz) =3D 430951 -MD5 (cvsup-without-gui.amd64.tar.bz2) =3D 5e83e6b68696058ebcc4e8666e8442a9 -SIZE (cvsup-without-gui.amd64.tar.bz2) =3D 335735 +MD5 (cvsup-without-gui.amd64.tar.bz2) =3D ced3a5ccca76550d239f1ec09e3822d4 +SIZE (cvsup-without-gui.amd64.tar.bz2) =3D 964594 --=20 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 --s/l3CgOIzMHHjg/5 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCVBZyXY6L6fI4GtQRAtpqAKCyddt0ONhZar7+V3CZkwH+SZNKQACfbmwJ McI7qyjgPEY84FPtYG5r+74= =pDyf -----END PGP SIGNATURE----- --s/l3CgOIzMHHjg/5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050406170408.GB20890>