diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2003-04-16 08:39:51 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2003-04-16 08:39:51 +0000 |
| commit | dd0a7d98414b5d05dc21bc23a849a2c6e32b733b (patch) | |
| tree | 76b8edcfb0c085b86b322457e7cd2524501cc5f1 /dev-lang/nhc98 | |
| parent | changed emake -> make (problem with parallel builds) (diff) | |
| download | gentoo-2-dd0a7d98414b5d05dc21bc23a849a2c6e32b733b.tar.gz gentoo-2-dd0a7d98414b5d05dc21bc23a849a2c6e32b733b.tar.bz2 gentoo-2-dd0a7d98414b5d05dc21bc23a849a2c6e32b733b.zip | |
cleaned up nhc98-1.16 ebuild
Diffstat (limited to 'dev-lang/nhc98')
| -rw-r--r-- | dev-lang/nhc98/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/nhc98/nhc98-1.16.ebuild | 49 |
2 files changed, 26 insertions, 28 deletions
diff --git a/dev-lang/nhc98/ChangeLog b/dev-lang/nhc98/ChangeLog index 465bd0bca67d..81a1e25e92bc 100644 --- a/dev-lang/nhc98/ChangeLog +++ b/dev-lang/nhc98/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-lang/nhc98 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/ChangeLog,v 1.6 2003/04/10 08:59:59 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/ChangeLog,v 1.7 2003/04/16 08:39:51 kosmikus Exp $ *nhc98-1.16 (09 Apr 2003) + 16 Apr 2003; Andres Loeh <andres@gentoo.org> nhc98-1.16.ebuild: + Cleaned up the ebuild, moving hmake configuration to postinst, see #18857 + 09 Apr 2003; George Shapovalov <george@gentoo.org> all : update and fix, see #18857, thanks to Andres Loeh <andres@cs.uu.nl> for ebuild diff --git a/dev-lang/nhc98/nhc98-1.16.ebuild b/dev-lang/nhc98/nhc98-1.16.ebuild index c37b5b35f4b1..fd4acb433f86 100644 --- a/dev-lang/nhc98/nhc98-1.16.ebuild +++ b/dev-lang/nhc98/nhc98-1.16.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-lang/nhc98/nhc98-1.16.ebuild,v 1.2 2003/04/10 23:20:56 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.16.ebuild,v 1.3 2003/04/16 08:39:51 kosmikus Exp $ IUSE="readline" @@ -13,7 +13,7 @@ HOMEPAGE="http://www.cs.york.ac.uk/fp/nhc98/" SLOT="0" LICENSE="nhc98" -KEYWORDS="x86 ~sparc " +KEYWORDS="~x86 ~sparc " DEPEND="virtual/glibc readline? ( >=readline-4.1 )" @@ -44,31 +44,6 @@ src_install () { # configure script. make DESTDIR=${D} install || die - #nhc's build system does not update hmakerc when using DESTDIR; - #therefore, we do it manually here - - einfo "Adjusting... hmakerc" - cd ${S} - MACHINE=`script/harch` - ${D}/usr/bin/hmake-config \ - ${D}/usr/lib/hmake/${MACHINE}/hmakerc add /usr/bin/nhc98 - ${D}/usr/bin/hmake-config \ - ${D}/usr/lib/hmake/${MACHINE}/hmakerc add nhc98 ||\ - einfo "(This error message is harmless)" - ${D}/usr/bin/hmake-config \ - ${D}/usr/lib/hmake/${MACHINE}/hmakerc \ - default /usr/bin/nhc98 - # remove temporary build version of nhc98 from config - ${D}/usr/bin/hmake-config \ - ${D}/usr/lib/hmake/${MACHINE}/hmakerc \ - delete ${S}/script/nhc98 - - #need to adjust paths in hmakerc - cd ${D}/usr/lib/hmake/${MACHINE} - mv hmakerc hmakerc.orig - sed -e "s:${S}/script/::" -e "s:${S}/include:/usr/include:" hmakerc.orig > hmakerc - - cd ${S} #install docs and man pages manually dodoc README INSTALL COPYRIGHT doman man/* @@ -78,3 +53,23 @@ src_install () { docinto html/bugs dodoc bugs/README } + +pkg_postinst () { + #nhc's build system does not update hmakerc when using DESTDIR; + #therefore, we do it manually here + + einfo "Adjusting... hmakerc" + MACHINE=`/usr/bin/harch` + /usr/bin/hmake-config \ + /usr/lib/hmake/${MACHINE}/hmakerc add /usr/bin/nhc98 + /usr/bin/hmake-config \ + /usr/lib/hmake/${MACHINE}/hmakerc add nhc98 ||\ + einfo "(This error message is harmless)" + /usr/bin/hmake-config \ + /usr/lib/hmake/${MACHINE}/hmakerc \ + default /usr/bin/nhc98 + # remove temporary build version of nhc98 from config + /usr/bin/hmake-config \ + /usr/lib/hmake/${MACHINE}/hmakerc \ + delete ${S}/script/nhc98 +} |