USE_PKGLOCALEDIR.

4 files changed, 26 insertions, 22 deletions

diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index 4fdbb145bc1..cc594e88ca7 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/09/21 01:23:56 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/11/30 15:31:59 salo Exp $
 
 DISTNAME=		chemtool-1.4.1
 CATEGORIES=		biology
@@ -9,8 +9,8 @@ HOMEPAGE=		http://www.uni-ulm.de/~s_tvolk/chemtool.html
 COMMENT=		Program for drawing organic molecules
 
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool
diff --git a/biology/chemtool/PLIST b/biology/chemtool/PLIST
index 559fc339715..97259005562 100644
--- a/biology/chemtool/PLIST
+++ b/biology/chemtool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/03 22:03:08 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/30 15:32:00 salo Exp $
 bin/chemtool
 bin/cht
 man/man1/chemtool.1
@@ -29,10 +29,10 @@ share/examples/chemtool/reaction.cht
 share/examples/chemtool/rutamycin_b.cht
 share/examples/chemtool/tcdd.cht
 share/examples/chemtool/viagra.cht
-share/locale/cs/LC_MESSAGES/chemtool.mo
-share/locale/de/LC_MESSAGES/chemtool.mo
-share/locale/fr/LC_MESSAGES/chemtool.mo
-share/locale/pl/LC_MESSAGES/chemtool.mo
-share/locale/ru/LC_MESSAGES/chemtool.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/chemtool.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/chemtool.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/chemtool.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/chemtool.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/chemtool.mo
 @dirrm share/examples/chemtool
 @dirrm share/doc/chemtool
diff --git a/biology/chemtool/distinfo b/biology/chemtool/distinfo
index 237b73ee752..909f1bdd340 100644
--- a/biology/chemtool/distinfo
+++ b/biology/chemtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/09/21 01:23:56 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/11/30 15:32:01 salo Exp $
 
 SHA1 (chemtool-1.4.1.tar.gz) = 03560d5bbc90e12032e80e5313fc257f3f0955d1
 Size (chemtool-1.4.1.tar.gz) = 150140 bytes
-SHA1 (patch-aa) = b675925f92902dd920c3afb43204c1d49d40bbd5
+SHA1 (patch-aa) = a2e1675bdf82a61ec5de5725b78f536da9ffb282
 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 80f130edc9a..8d47652b802 100644
--- a/biology/chemtool/patches/patch-aa
+++ b/biology/chemtool/patches/patch-aa
@@ -1,27 +1,32 @@
-$NetBSD: patch-aa,v 1.7 2002/09/21 01:23:57 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2002/11/30 15:32:02 salo Exp $
 
---- Makefile.orig	Sat Sep  8 07:56:18 2001
-+++ Makefile
-@@ -1,16 +1,6 @@
+--- Makefile.orig	Sat Sep  8 16:56:18 2001
++++ Makefile	Sat Nov 30 12:56:37 2002
+@@ -1,21 +1,10 @@
 -PREFIX=/usr/local
 -LOCALEDIR=/usr/share/locale
-+LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
++localedir=/usr/share/locale
  
 -ifdef LOCALEDIR
 -CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DLOCALEDIR=\"${LOCALEDIR}\" 
 -else
 -CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DDISABLE_NLS
 -endif
--
++CFLAGS=-O2 -Wall `gtk-config --cflags` -DMENU -DLOCALEDIR=\"${localedir}\" 
+ 
 -CC=gcc
 -CP=/bin/cp
 -RM=/bin/rm -f
 -MAKE=make
-+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 
-@@ -25,17 +15,15 @@ default:	all
+ 
+-
+ SYS_LIBRARIES = `gtk-config --libs` -lm
+ 
+ all: chemtool cht
+@@ -25,17 +14,13 @@
  chemtool: ${OBJS}
  	${CC} ${OBJS} ${SYS_LIBRARIES} -o chemtool
  
@@ -29,7 +34,7 @@ $NetBSD: patch-aa,v 1.7 2002/09/21 01:23:57 jlam Exp $
 +cht:	src-cht/cht-1.8.c
  	cd src-cht;${MAKE}
  
- 
+-
  install: chemtool src-cht/cht
 -	${CP} chemtool src-cht/cht ${PREFIX}/bin
 -	${CP} chemtool.1 ${PREFIX}/man/man1
@@ -39,8 +44,7 @@ $NetBSD: patch-aa,v 1.7 2002/09/21 01:23:57 jlam Exp $
 -	endif 
 +	${BSD_INSTALL_PROGRAM} chemtool src-cht/cht ${PREFIX}/bin
 +	${BSD_INSTALL_MAN} chemtool.1 cht.1 ${PREFIX}/man/man1
-+	for L in `ls locales`; do ${BSD_INSTALL_DATA} locales/$$L/chemtool.mo ${LOCALEDIR}/$$L/LC_MESSAGES;done
-+
++	for L in `ls locales`; do ${BSD_INSTALL_DATA} locales/$$L/chemtool.mo ${localedir}/$$L/LC_MESSAGES;done
  clean:
  	${RM} *.o *~ src-cht/*.o src-cht/*~ chemtool src-cht/cht