pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/biology/phylip Don't depend on hard-coded /usr/X11R6 a...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a762680a4bec
branches: trunk
changeset: 504971:a762680a4bec
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Dec 28 13:46:07 2005 +0000
description:
Don't depend on hard-coded /usr/X11R6 and honor CFLAGS. Bump revision.
diffstat:
biology/phylip/Makefile | 8 +++++---
biology/phylip/distinfo | 4 ++--
biology/phylip/patches/patch-aa | 28 +++++++++++++++++++++++-----
3 files changed, 30 insertions(+), 10 deletions(-)
diffs (81 lines):
diff -r 280b7460d4b3 -r a762680a4bec biology/phylip/Makefile
--- a/biology/phylip/Makefile Wed Dec 28 13:19:26 2005 +0000
+++ b/biology/phylip/Makefile Wed Dec 28 13:46:07 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/28 13:46:07 joerg Exp $
DISTNAME= phylip-3.61
+PKGREVISION= 1
CATEGORIES= biology
MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/phylip/
@@ -16,8 +17,6 @@
INSTALLATION_DIRS= bin
-.include "../../mk/x11.buildlink3.mk"
-
do-install:
.for PROGRAM in clique consense contml contrast dnacomp dnadist \
dnainvar dnaml dnamlk dnamove dnapars dnapenny \
@@ -46,4 +45,7 @@
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${HTML} ${PREFIX}/share/doc/html/phylip
.endfor
+MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q}
+
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 280b7460d4b3 -r a762680a4bec biology/phylip/distinfo
--- a/biology/phylip/distinfo Wed Dec 28 13:19:26 2005 +0000
+++ b/biology/phylip/distinfo Wed Dec 28 13:46:07 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:28:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/28 13:46:07 joerg Exp $
SHA1 (phylip-3.61.tar.gz) = f852d860cd2b05bfacb4c7b7ca9baa9163592106
RMD160 (phylip-3.61.tar.gz) = c783f947f204a653d9d5ed8e54e93368c46513de
Size (phylip-3.61.tar.gz) = 835969 bytes
-SHA1 (patch-aa) = c92bef99d88552d46a72ca8b2a4c8abb246537cd
+SHA1 (patch-aa) = 268469d311183447d86db0274f0fd5079c6b16d6
diff -r 280b7460d4b3 -r a762680a4bec biology/phylip/patches/patch-aa
--- a/biology/phylip/patches/patch-aa Wed Dec 28 13:19:26 2005 +0000
+++ b/biology/phylip/patches/patch-aa Wed Dec 28 13:46:07 2005 +0000
@@ -1,13 +1,31 @@
-$NetBSD: patch-aa,v 1.1 2004/08/16 23:58:35 ben Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/28 13:46:07 joerg Exp $
---- Makefile.orig 2004-08-15 12:23:29.000000000 +0200
-+++ Makefile 2004-08-15 12:24:04.000000000 +0200
-@@ -111,7 +111,7 @@
+--- Makefile.orig 2003-12-23 05:21:14.000000000 +0000
++++ Makefile
+@@ -62,7 +62,7 @@ EXEDIR = ../exe
+ #
+ #
+ #A minimal one
+-CFLAGS =
++#CFLAGS =
+ #
+ # A basic one for debugging
+ #CFLAGS = -g
+@@ -111,7 +111,7 @@ LIBS = -lm
#
# For gcc for Linux with X windows development packages installed
# or for MacOS X with X windows installed
-DLIBS= -L/usr/X11R6/lib/ -lX11 -lXaw -lXt
-+DLIBS= -L/usr/X11R6/lib/ -Wl,-rpath,/usr/X11R6/lib -lX11 -lXaw -lXt
++DLIBS= ${X11_LDFLAGS} -lX11 -lXaw -lXt
#
# ----------------------------------------------------------------------------
#
+@@ -119,7 +119,7 @@ DLIBS= -L/usr/X11R6/lib/ -lX11 -lXaw -lX
+ # ordinary compiles and the tree-drawing programs, CC and DC
+ #
+ # This one specifies the "cc" C compiler
+-CC = cc $(CFLAGS)
++CC := ${CC} $(CFLAGS)
+ #
+ # To use GCC instead, if it is not the compiler that "cc" invokes
+ #CC = gcc $(CFLAGS)
Home |
Main Index |
Thread Index |
Old Index