| 1 |
grobian 09/09/30 20:13:38 |
| 2 |
|
| 3 |
Modified: tcsh-6.16.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Merge Prefix changes, no differences in functionality or behaviour |
| 6 |
(Portage version: 2.2.00.14456-prefix/cvs/Darwin powerpc) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.9 app-shells/tcsh/tcsh-6.16.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild?rev=1.9&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild?rev=1.9&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild?r1=1.8&r2=1.9 |
| 14 |
|
| 15 |
Index: tcsh-6.16.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v |
| 18 |
retrieving revision 1.8 |
| 19 |
retrieving revision 1.9 |
| 20 |
diff -u -r1.8 -r1.9 |
| 21 |
--- tcsh-6.16.ebuild 10 Apr 2009 19:52:35 -0000 1.8 |
| 22 |
+++ tcsh-6.16.ebuild 30 Sep 2009 20:13:37 -0000 1.9 |
| 23 |
@@ -1,36 +1,39 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.8 2009/04/10 19:52:35 grobian Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.9 2009/09/30 20:13:37 grobian Exp $ |
| 28 |
|
| 29 |
-inherit eutils |
| 30 |
+inherit eutils flag-o-matic autotools prefix |
| 31 |
|
| 32 |
-CONFVER="1.7" |
| 33 |
+CONFVER="1.8" |
| 34 |
|
| 35 |
MY_P="${P}.00" |
| 36 |
DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" |
| 37 |
HOMEPAGE="http://www.tcsh.org/" |
| 38 |
SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz |
| 39 |
- mirror://gentoo/tcsh-config-${CONFVER}.tar.bz2 |
| 40 |
- http://www.gentoo.org/~grobian/distfiles/tcsh-config-${CONFVER}.tar.bz2" |
| 41 |
+ http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" |
| 42 |
|
| 43 |
LICENSE="BSD" |
| 44 |
SLOT="0" |
| 45 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
| 46 |
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 47 |
IUSE="perl catalogs" |
| 48 |
RESTRICT="test" |
| 49 |
|
| 50 |
+# we need gettext because we run autoconf |
| 51 |
DEPEND=">=sys-libs/ncurses-5.1 |
| 52 |
- perl? ( dev-lang/perl ) |
| 53 |
- !app-shells/csh" # bug #119703 |
| 54 |
+ sys-devel/gettext |
| 55 |
+ perl? ( dev-lang/perl )" |
| 56 |
RDEPEND="${DEPEND}" |
| 57 |
|
| 58 |
S=${WORKDIR}/${MY_P} |
| 59 |
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} |
| 60 |
|
| 61 |
src_unpack() { |
| 62 |
unpack ${A} |
| 63 |
cd "${S}" |
| 64 |
epatch "${FILESDIR}/${MY_P/16/14}"-debian-dircolors.patch # bug #120792 |
| 65 |
epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951 |
| 66 |
+ epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch |
| 67 |
+ eautoreconf |
| 68 |
|
| 69 |
if use catalogs ; then |
| 70 |
einfo "enabling NLS catalogs support..." |
| 71 |
@@ -38,10 +41,33 @@ |
| 72 |
config_f.h || die |
| 73 |
eend $? |
| 74 |
fi |
| 75 |
+ |
| 76 |
+ # unify ECHO behaviour |
| 77 |
+ echo "#undef ECHO_STYLE" >> config_f.h |
| 78 |
+ echo "#define ECHO_STYLE BOTH_ECHO" >> config_f.h |
| 79 |
+ |
| 80 |
+ eprefixify "${CONFDIR}"/* |
| 81 |
+ # activate the right default PATH |
| 82 |
+ if [[ -z ${EPREFIX} ]] ; then |
| 83 |
+ sed -i \ |
| 84 |
+ -e 's/^#MAIN//' -e '/^#PREFIX/d' \ |
| 85 |
+ "${CONFDIR}"/csh.login || die |
| 86 |
+ else |
| 87 |
+ sed -i \ |
| 88 |
+ -e 's/^#PREFIX//' -e '/^#MAIN/d' \ |
| 89 |
+ "${CONFDIR}"/csh.login || die |
| 90 |
+ fi |
| 91 |
} |
| 92 |
|
| 93 |
src_compile() { |
| 94 |
- econf --prefix=/ || die "econf failed" |
| 95 |
+ # make tcsh look and live along the lines of the prefix |
| 96 |
+ append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'" |
| 97 |
+ append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'" |
| 98 |
+ append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'" |
| 99 |
+ append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'" |
| 100 |
+ append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'" |
| 101 |
+ |
| 102 |
+ econf --prefix="${EPREFIX:-/}" || die "econf failed" |
| 103 |
emake || die "compile problem" |
| 104 |
} |
| 105 |
|
| 106 |
@@ -55,8 +81,8 @@ |
| 107 |
|
| 108 |
insinto /etc |
| 109 |
doins \ |
| 110 |
- "${WORKDIR}"/tcsh-config/csh.cshrc \ |
| 111 |
- "${WORKDIR}"/tcsh-config/csh.login |
| 112 |
+ "${CONFDIR}"/csh.cshrc \ |
| 113 |
+ "${CONFDIR}"/csh.login |
| 114 |
|
| 115 |
dodoc FAQ Fixes NewThings Ported README WishList Y2K |
| 116 |
|
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
1.95 app-shells/tcsh/ChangeLog |
| 121 |
|
| 122 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/tcsh/ChangeLog?rev=1.95&view=markup |
| 123 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/tcsh/ChangeLog?rev=1.95&content-type=text/plain |
| 124 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/tcsh/ChangeLog?r1=1.94&r2=1.95 |
| 125 |
|
| 126 |
Index: ChangeLog |
| 127 |
=================================================================== |
| 128 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v |
| 129 |
retrieving revision 1.94 |
| 130 |
retrieving revision 1.95 |
| 131 |
diff -u -r1.94 -r1.95 |
| 132 |
--- ChangeLog 10 Apr 2009 19:52:35 -0000 1.94 |
| 133 |
+++ ChangeLog 30 Sep 2009 20:13:37 -0000 1.95 |
| 134 |
@@ -1,6 +1,9 @@ |
| 135 |
# ChangeLog for app-shells/tcsh |
| 136 |
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 137 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.94 2009/04/10 19:52:35 grobian Exp $ |
| 138 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 139 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.95 2009/09/30 20:13:37 grobian Exp $ |
| 140 |
+ |
| 141 |
+ 30 Sep 2009; Fabian Groffen <grobian@g.o> tcsh-6.16.ebuild: |
| 142 |
+ Merge Prefix changes, no differences in functionality or behaviour |
| 143 |
|
| 144 |
10 Apr 2009; Fabian Groffen <grobian@g.o> tcsh-6.16.ebuild: |
| 145 |
Bump patchset to remove cr0 from stty call, since this is non-POSIX, and |
Archives