diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2003-12-31 02:19:16 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2003-12-31 02:19:16 +0000 |
commit | 3a3a1d2a3b65f9e0c4c4add2c2aec2e4700cc001 (patch) | |
tree | c7d245abfaacbcd2cba6bfe9928cf75e799fc0dc /dev-util/cvsup | |
parent | Wrong use of "useflag?" in DEPEND fixed (killed repoman) (Manifest recommit) (diff) | |
download | gentoo-2-3a3a1d2a3b65f9e0c4c4add2c2aec2e4700cc001.tar.gz gentoo-2-3a3a1d2a3b65f9e0c4c4add2c2aec2e4700cc001.tar.bz2 gentoo-2-3a3a1d2a3b65f9e0c4c4add2c2aec2e4700cc001.zip |
use sed -i and do more checking/reporting of errors
Diffstat (limited to 'dev-util/cvsup')
-rw-r--r-- | dev-util/cvsup/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/cvsup/Manifest | 14 | ||||
-rw-r--r-- | dev-util/cvsup/cvsup-16.1h.ebuild | 74 |
3 files changed, 52 insertions, 41 deletions
diff --git a/dev-util/cvsup/ChangeLog b/dev-util/cvsup/ChangeLog index 46281d6f5d72..7e7e3578ba2b 100644 --- a/dev-util/cvsup/ChangeLog +++ b/dev-util/cvsup/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/cvsup # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/ChangeLog,v 1.10 2003/07/17 23:23:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/ChangeLog,v 1.11 2003/12/31 02:19:03 mr_bones_ Exp $ + + 30 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> cvsup-16.1h.ebuild: + use sed -i and do more checking/reporting of errors *cvsup-16.1h (17 Apr 2003) diff --git a/dev-util/cvsup/Manifest b/dev-util/cvsup/Manifest index b4ca4c277315..a5c1abc3c365 100644 --- a/dev-util/cvsup/Manifest +++ b/dev-util/cvsup/Manifest @@ -1,11 +1,11 @@ -MD5 743c2daa11dade483c2064dd7515b502 files/cvsupd.confd 380 +MD5 a60f7b5d9b08c81bb98fab54dca815d0 ChangeLog 1257 +MD5 0b1bc9b7ef7f86003c961a8fc21f701b cvsup-16.1e.ebuild 593 +MD5 5254a5337bb4000917c80900c1f235c4 cvsup-16.1h.ebuild 4050 +MD5 ef851a57002484a5917f1b446e231e69 files/16.1h-ppc.patch 1179 MD5 8dfbd6317bf54cfaa516faffc69616d8 files/99cvsup 36 -MD5 3f47f29ce5967adb60f63c5e251f1452 files/gentoo_mirror.sup 208 +MD5 743c2daa11dade483c2064dd7515b502 files/cvsupd.confd 380 +MD5 406ba7fa8b992a3b12bc65adc871a4e0 files/cvsupd.rc 569 MD5 cc11c0abb6ab9668d01ca6359f8b23e3 files/digest-cvsup-16.1e 79 MD5 393154754f0d144a7cb93927a7c88acf files/digest-cvsup-16.1h 213 -MD5 406ba7fa8b992a3b12bc65adc871a4e0 files/cvsupd.rc 569 MD5 9a5b6ecba759a5260d4fb3d4e07a4c9c files/gentoo.sup 153 -MD5 ef851a57002484a5917f1b446e231e69 files/16.1h-ppc.patch 1179 -MD5 9ca4f5069fc5143c720e4bc681d8f025 cvsup-16.1h.ebuild 3838 -MD5 0b1bc9b7ef7f86003c961a8fc21f701b cvsup-16.1e.ebuild 593 -MD5 ccda54fa99a446a201010b0c318ea22d ChangeLog 1124 +MD5 3f47f29ce5967adb60f63c5e251f1452 files/gentoo_mirror.sup 208 diff --git a/dev-util/cvsup/cvsup-16.1h.ebuild b/dev-util/cvsup/cvsup-16.1h.ebuild index 389a8bcf3516..bbc6fd33fc69 100644 --- a/dev-util/cvsup/cvsup-16.1h.ebuild +++ b/dev-util/cvsup/cvsup-16.1h.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1h.ebuild,v 1.5 2003/09/13 07:33:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1h.ebuild,v 1.6 2003/12/31 02:19:03 mr_bones_ Exp $ MY_P="${P/-/-snap-}" EZM3="ezm3-1.1" @@ -13,12 +13,14 @@ SRC_URI="ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/sources/${MY_P}.ta ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/${EZM3}-src.tar.bz2 ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/${EZM3}-${EZM3_TARGET}-boot.tar.bz2" +KEYWORDS="x86 ~ppc" LICENSE="BSD" SLOT="0" -KEYWORDS="x86 ~ppc" +IUSE="X opengl static" DEPEND="virtual/glibc dev-util/yacc + >=sys-apps/sed-4 ppc? ( dev-lang/cm3 )" RDEPEND="virtual/glibc" @@ -40,20 +42,22 @@ src_compile() { ######################## # when you do make, ezm3 builds & installs at the same time so we control - # where it is going to install the compiler and stuff (to not violate sandbox) + # where it is going to install the compiler and stuff + # (to not violate sandbox) cd ${S}/${EZM3}/m3config/src - cp ${EZM3_TARGET} ${EZM3_TARGET}.old - sed -e "s:/usr/local:${EZM3_INSTALL}:" \ - ${EZM3_TARGET}.old > ${EZM3_TARGET} + sed -i \ + -e "s:/usr/local:${EZM3_INSTALL}:" ${EZM3_TARGET} || \ + die "sed ${EZM3_TARGET} failed" echo "M3CC_MAKE = [\"make\", \"BISON=yacc\"]" >> ${EZM3_TARGET} # now we disable X and OpenGL if the user doesnt have them in their USE var - cp COMMON COMMON.old - sed -e "s:/usr/local:${EZM3_INSTALL}:" \ - -e "s:touch:ranlib:" \ - -e "s:`seduse X 'import_X11():import_X11() is\nend\nproc dont_import_X11()'`:" \ - -e "s:`seduse opengl 'import_OpenGL():import_OpenGL() is\nend\nproc dont_import_OpenGL()'`:" \ - COMMON.old > COMMON + sed -i \ + -e "s:/usr/local:${EZM3_INSTALL}:" \ + -e "s:touch:ranlib:" \ + -e "s:`seduse X 'import_X11():import_X11() is\nend\nproc dont_import_X11()'`:" \ + -e "s:`seduse opengl 'import_OpenGL():import_OpenGL() is\nend\nproc dont_import_OpenGL()'`:" \ + COMMON || \ + die "sed COMMON failed" # finally we compile the m3 compiler # we clear the CFLAGS because: @@ -71,19 +75,20 @@ src_compile() { # first we disable the gui (if no X) and enable static (if static is in USE) cd ${S}/${MY_P} - local mym3flags; mym3flags="" + local mym3flags="" use static && mym3flags="${mym3flags} -DSTATIC" use X || mym3flags="${mym3flags} -DNOGUI" [ "${mym3flags:0:1}" == " " ] && mym3flags="${mym3flags:1}" - cp Makefile Makefile.old - sed -e "s:/usr/local:${D}/usr:" \ - -e "s:^M3FLAGS=:M3FLAGS=${mym3flags}:" \ - Makefile.old > Makefile + sed -i \ + -e "s:/usr/local:${D}/usr:" \ + -e "s:^M3FLAGS=:M3FLAGS=${mym3flags}:" Makefile || \ + die "sed Makefile failed" # then we fix the /usr/local/etc/cvsup paths in all the files for f in `grep /usr/local/etc * -Rl` ; do - cp ${f} ${f}.old - sed -e "s:/usr/local/etc:/etc:" ${f}.old > ${f} + sed -i \ + -e "s:/usr/local/etc:/etc:" ${f} || \ + die "sed ${f} failed" done # then we compile cvsup @@ -93,8 +98,9 @@ src_compile() { cd ${S}/${MY_P}/doc make || die "html pages failed to compile !?" for f in `ls *.html` ; do - cp ${f} ${f}.old - sed -e "s:images/::" ${f}.old > ${f} + sed -i \ + -e "s:images/::" ${f} || \ + die "sed ${f} failed" done mv ${S}/${MY_P}/doc/images/* ${S}/${MY_P}/doc/ } @@ -103,26 +109,28 @@ src_install() { S="${S}/${MY_P}" for f in `find ${S} -perm +1 -type f | grep -v doc` ; do - dobin ${f} + dobin ${f} || die "dobin failed (${f})" done - doman ${S}/client/${EZM3_TARGET}/cvsup.1 - doman ${S}/cvpasswd/${EZM3_TARGET}/cvpasswd.1 - doman ${S}/server/${EZM3_TARGET}/cvsupd.8 + doman ${S}/client/${EZM3_TARGET}/cvsup.1 \ + ${S}/cvpasswd/${EZM3_TARGET}/cvpasswd.1 \ + ${S}/server/${EZM3_TARGET}/cvsupd.8 || \ + die "doman failed" - dohtml ${S}/doc/*.{html,gif} + dohtml ${S}/doc/*.{html,gif} || die "dohtml failed" - dodoc ${S}/{Acknowledgments,Announce,Blurb,ChangeLog,License,Install} + dodoc ${S}/{Acknowledgments,Announce,Blurb,ChangeLog,License,Install} || \ + die "dodoc failed" - dodir /etc/cvsup insinto /etc/cvsup - doins ${FILESDIR}/gentoo.sup - doins ${FILESDIR}/gentoo_mirror.sup + doins ${FILESDIR}/gentoo.sup ${FILESDIR}/gentoo_mirror.sup || \ + die "doins failed" exeinto /etc/init.d - newexe ${FILESDIR}/cvsupd.rc cvsupd + newexe ${FILESDIR}/cvsupd.rc cvsupd || die "newexe failed" + insinto /etc/conf.d - newins ${FILESDIR}/cvsupd.confd cvsupd + newins ${FILESDIR}/cvsupd.confd cvsupd || die "newins failed" - dodir /var/cvsup + dodir /var/cvsup || die "dodir failed" } |