From ca9a67c930a72a8d75c2fd28abc90d7ef1996f97 Mon Sep 17 00:00:00 2001 From: zuntum Date: Sat, 30 Jun 2001 11:56:20 +0000 Subject: Converted to use buildlink.mk --- biology/chemtool/Makefile | 7 ++++--- biology/chemtool/distinfo | 4 ++-- biology/chemtool/patches/patch-aa | 12 +++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'biology') diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile index a9fac5e2f86..7e4fdffff61 100644 --- a/biology/chemtool/Makefile +++ b/biology/chemtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/04/28 23:59:18 jtb Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/30 11:58:46 zuntum Exp $ DISTNAME= chemtool-1.3 CATEGORIES= biology @@ -8,9 +8,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.uni-ulm.de/~s_tvolk/chemtool.html COMMENT= Program for drawing organic molecules -DEPENDS+= gtk+>=1.0.0:../../x11/gtk - +USE_BUILDLINK_ONLY= YES MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +MAKE_ENV+= GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool @@ -19,4 +19,5 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} README TODO \ ${PREFIX}/share/doc/chemtool/ +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/biology/chemtool/distinfo b/biology/chemtool/distinfo index 97935191147..58af2e9d0d9 100644 --- a/biology/chemtool/distinfo +++ b/biology/chemtool/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:02:24 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/06/30 11:58:46 zuntum Exp $ SHA1 (chemtool-1.3.tar.gz) = d1d9e7fee195f2845f3bafaf995521516f9930f6 Size (chemtool-1.3.tar.gz) = 90616 bytes -SHA1 (patch-aa) = 25a4397878c387ec78737133381ae1daddd50fe1 +SHA1 (patch-aa) = 2b663d0a7cead5ac61d7325a2ceea3f5c48fc1dd SHA1 (patch-ab) = cac82a03d026a9cd1bbea819218682da4b024924 SHA1 (patch-ac) = 01e3786e50275e82b64340d591a3aebad7bc2174 diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa index dba56e897eb..300aba9de71 100644 --- a/biology/chemtool/patches/patch-aa +++ b/biology/chemtool/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2001/03/04 17:33:42 jtb Exp $ +$NetBSD: patch-aa,v 1.4 2001/06/30 11:58:47 zuntum Exp $ ---- Makefile.orig Tue Feb 6 18:52:54 2001 +--- Makefile.orig Tue Feb 6 19:52:54 2001 +++ Makefile -@@ -1,15 +1,15 @@ +@@ -1,16 +1,16 @@ -PREFIX=/usr/local -LOCALEDIR=/usr/share/locale -CFLAGS=-O2 -Wall @@ -21,10 +21,12 @@ $NetBSD: patch-aa,v 1.3 2001/03/04 17:33:42 jtb Exp $ -EXTRA_INCLUDES = `gtk-config --cflags` # -DDISABLE_NLS -+EXTRA_INCLUDES = `gtk-config --cflags` -I${LOCALBASE}/include # -DDISABLE_NLS - SYS_LIBRARIES = `gtk-config --libs` -lm +-SYS_LIBRARIES = `gtk-config --libs` -lm ++EXTRA_INCLUDES = `$(GTK_CONFIG) --cflags` # -DDISABLE_NLS ++SYS_LIBRARIES = `$(GTK_CONFIG) --libs` -lm all: chemtool cht + @@ -25,9 +25,9 @@ ${CC} ${CFLAGS} ${EXTRA_INCLUDES} -c ${SRCS} -- cgit v1.2.3