summaryrefslogtreecommitdiff
path: root/biology
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-09-21 01:23:56 +0000
committerjlam <jlam@pkgsrc.org>2002-09-21 01:23:56 +0000
commit48b937280b306ee3ee63d23835deb281e8bd59cb (patch)
treed7bdcf2470c8a394a96569fd3763453a3955c545 /biology
parentf960a557cdf393aaa0889518aa4068ea0ae83e1d (diff)
downloadpkgsrc-48b937280b306ee3ee63d23835deb281e8bd59cb.tar.gz
buildlink1 -> buildlink2
Diffstat (limited to 'biology')
-rw-r--r--biology/chemtool/Makefile8
-rw-r--r--biology/chemtool/distinfo4
-rw-r--r--biology/chemtool/patches/patch-aa20
3 files changed, 13 insertions, 19 deletions
diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index bd31dd49947..4fdbb145bc1 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/05/03 22:03:08 jtb Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/21 01:23:56 jlam Exp $
DISTNAME= chemtool-1.4.1
CATEGORIES= biology
@@ -8,7 +8,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.uni-ulm.de/~s_tvolk/chemtool.html
COMMENT= Program for drawing organic molecules
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
+USE_X11= # defined
MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
post-install:
@@ -18,6 +19,5 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} README TODO \
${PREFIX}/share/doc/chemtool/
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/biology/chemtool/distinfo b/biology/chemtool/distinfo
index b90ecae2bae..237b73ee752 100644
--- a/biology/chemtool/distinfo
+++ b/biology/chemtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/05/03 22:03:08 jtb Exp $
+$NetBSD: distinfo,v 1.5 2002/09/21 01:23:56 jlam Exp $
SHA1 (chemtool-1.4.1.tar.gz) = 03560d5bbc90e12032e80e5313fc257f3f0955d1
Size (chemtool-1.4.1.tar.gz) = 150140 bytes
-SHA1 (patch-aa) = 739fe870f755e44b1ca5be862f69640300f2f07e
+SHA1 (patch-aa) = b675925f92902dd920c3afb43204c1d49d40bbd5
SHA1 (patch-ab) = 258a7940f5a2135891f61c30f02c7c57b67aeaa2
SHA1 (patch-ac) = 05d31454c8e1609ce406be54d8390defbbe35c1f
SHA1 (patch-ad) = 26f3e4dc18c355185937c34cd7ec789d358d3a02
diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa
index ef6327d9fb8..80f130edc9a 100644
--- a/biology/chemtool/patches/patch-aa
+++ b/biology/chemtool/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2002/05/20 17:25:43 cjep Exp $
---- Makefile.orig Sat Sep 8 15:56:18 2001
-+++ Makefile Mon Apr 29 10:27:24 2002
-@@ -1,22 +1,12 @@
+$NetBSD: patch-aa,v 1.7 2002/09/21 01:23:57 jlam Exp $
+
+--- Makefile.orig Sat Sep 8 07:56:18 2001
++++ Makefile
+@@ -1,16 +1,6 @@
-PREFIX=/usr/local
-LOCALEDIR=/usr/share/locale
+LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
@@ -16,18 +17,11 @@ $NetBSD: patch-aa,v 1.6 2002/05/20 17:25:43 cjep Exp $
-CP=/bin/cp
-RM=/bin/rm -f
-MAKE=make
-+CFLAGS+= -Wall `${GTK_CONFIG} --cflags` -DMENU -DLOCALEDIR=\"${LOCALEDIR}\"
++CFLAGS+= -Wall `gtk-config --cflags` -DMENU -DLOCALEDIR=\"${LOCALEDIR}\"
SRCS = main.c chemproc.c graph.c draw.c inout.c
OBJS = main.o chemproc.o graph.o draw.o inout.o
-
-
--SYS_LIBRARIES = `gtk-config --libs` -lm
-+SYS_LIBRARIES = `${GTK_CONFIG} --libs` -lm
-
- all: chemtool cht
-
-@@ -25,17 +15,15 @@
+@@ -25,17 +15,15 @@ default: all
chemtool: ${OBJS}
${CC} ${OBJS} ${SYS_LIBRARIES} -o chemtool