diff options
| author | dholland <dholland@pkgsrc.org> | 2010-07-31 19:14:08 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2010-07-31 19:14:08 +0000 |
| commit | 9b28e7358282e4e4c6606605db89e1c556b9f2d5 (patch) | |
| tree | 1259d0df724aa425bc38b0c5d7fe46a3bc6b27ff /biology | |
| parent | 1daa5b2042008dddbc870d87cb30b80b16fc2817 (diff) | |
| download | pkgsrc-9b28e7358282e4e4c6606605db89e1c556b9f2d5.tar.gz | |
Fix destdir follies and resulting plist lossage. PR 43579.
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/gromacs/Makefile | 4 | ||||
| -rw-r--r-- | biology/gromacs/distinfo | 3 | ||||
| -rw-r--r-- | biology/gromacs/patches/patch-ak | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/biology/gromacs/Makefile b/biology/gromacs/Makefile index ee0f078fc78..c9646e837c2 100644 --- a/biology/gromacs/Makefile +++ b/biology/gromacs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2010/05/16 12:04:03 asau Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/31 19:14:08 dholland Exp $ # DISTNAME= gromacs-4.0.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= biology MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ diff --git a/biology/gromacs/distinfo b/biology/gromacs/distinfo index 447c35bd131..922dd4baa8a 100644 --- a/biology/gromacs/distinfo +++ b/biology/gromacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2010/06/17 09:26:16 asau Exp $ +$NetBSD: distinfo,v 1.4 2010/07/31 19:14:08 dholland Exp $ SHA1 (gromacs-4.0.7.tar.gz) = 8519bef2fa989fb487d54612b0a2d0228f228b30 RMD160 (gromacs-4.0.7.tar.gz) = 4fa8e5c90f549ef627a98a907a166676692a4c4b @@ -13,3 +13,4 @@ SHA1 (patch-ag) = 5d46a0dba7db4dbf08ea83d448a6e5201871d217 SHA1 (patch-ah) = ad930cbb9f448780ca8745b899fe54c5470fff3b SHA1 (patch-ai) = ed4aa71eb56d1300c67cd17057f72ea452739f3d SHA1 (patch-aj) = 080d2923d729ff00de0f2cae75a82ec6c3769d6c +SHA1 (patch-ak) = bdfebf85422a6a9025d1f2c71921c4cc1c3069c4 diff --git a/biology/gromacs/patches/patch-ak b/biology/gromacs/patches/patch-ak new file mode 100644 index 00000000000..3e98cf730fc --- /dev/null +++ b/biology/gromacs/patches/patch-ak @@ -0,0 +1,34 @@ +$NetBSD: patch-ak,v 1.1 2010/07/31 19:14:08 dholland Exp $ + +Disable the extra symlinks like in src/gmxlib/Makefile.in; this makes +the install behavior uniform for all the libraries. + +Note that if re-enabled the references to "libdir" below need DESTDIR +affixed, or it'll blow up if USE_DESTDIR is set. + + +--- src/tools/Makefile.in.orig 2009-12-06 21:18:54.000000000 +0000 ++++ src/tools/Makefile.in +@@ -1407,14 +1407,14 @@ uninstall-am: uninstall-binPROGRAMS unin + + + # link the mpi library to non-mpi names if the latter are not present +-install-exec-hook: +- libname="libgmxana@LIBSUFFIX@"; \ +- nompi="`echo $$libname | sed -e 's,_mpi,,'`"; \ +- libdir="$(libdir)"; \ +- if echo $$libname | grep mpi >/dev/null ; then \ +- (cd $$libdir && test -e $$libname.a -a ! -e $$nompi.a && $(LN_S) $$libname.a $$nompi.a ; exit 0); \ +- (cd $$libdir && test -e $$libname.so -a ! -e $$nompi.so && $(LN_S) $$libname.so $$nompi.so ; exit 0); \ +- fi; ++install-exec-hook: ; ++# libname="libgmxana@LIBSUFFIX@"; \ ++# nompi="`echo $$libname | sed -e 's,_mpi,,'`"; \ ++# libdir="$(libdir)"; \ ++# if echo $$libname | grep mpi >/dev/null ; then \ ++# (cd $$libdir && test -e $$libname.a -a ! -e $$nompi.a && $(LN_S) $$libname.a $$nompi.a ; exit 0); \ ++# (cd $$libdir && test -e $$libname.so -a ! -e $$nompi.so && $(LN_S) $$libname.so $$nompi.so ; exit 0); \ ++# fi; + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |