Update to version 2.0.4 and fixed package to work on systems where a

C char is unsigned.

Summary of changes:

* Addition of much more data on the elements
* Rewritten to use gtk2
* Internationalisation support through gettext added
* Many bug fixes

6 files changed, 109 insertions, 42 deletions

diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index fcf13140f4d..335ed83f4f8 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,33 +1,22 @@
-# $NetBSD: Makefile,v 1.12 2003/05/02 11:55:49 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.13 2003/05/10 01:31:25 jtb Exp $
 
-DISTNAME=	gperiodic-1.2.6
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/gperiodic
-CATEGORIES=	misc x11
-MASTER_SITES=	ftp://ftp.seul.org/pub/gperiodic/
+DISTNAME=		gperiodic-2.0.4
+CATEGORIES=		misc x11
+MASTER_SITES=		http://www.acclab.helsinki.fi/~frantz/software/
 
-MAINTAINER=	jlam@netbsd.org
-HOMEPAGE=	http://gperiodic.seul.org/
-COMMENT=	Displays a periodic table of the elements
+MAINTAINER=		jlam@netbsd.org
+HOMEPAGE=		http://www.acclab.helsinki.fi/~frantz/software/gperiodic.php
+COMMENT=		Displays a periodic table of the elements
 
 BUILD_USES_MSGFMT=	# defined
 
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
-USE_X11BASE=		# defined
+USE_X11=		# defined
 USE_GMAKE=		# defined
-GNU_CONFIGURE=		# defined
 
-pre-configure:
-.for f in config.cache config.h config.log config.status
-	${RM} -f ${WRKSRC}/$f
-.endfor
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1/
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gperiodic/PLIST b/misc/gperiodic/PLIST
index 28d46ad9245..06eca7ae546 100644
--- a/misc/gperiodic/PLIST
+++ b/misc/gperiodic/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/01 16:25:57 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/10 01:31:25 jtb Exp $
 bin/gperiodic
-man/man1/gperiodic.1
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gperiodic.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gperiodic.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gperiodic.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gperiodic.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gperiodic.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gperiodic.mo
+share/gnome/apps/Applications/gperiodic.desktop
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gperiodic.mo
+share/pixmaps/gperiodic.png
+@unexec ${RMDIR} %D/share/gnome/apps/Applications 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE}
diff --git a/misc/gperiodic/distinfo b/misc/gperiodic/distinfo
index aadb08c4a74..cc8ecd87bb0 100644
--- a/misc/gperiodic/distinfo
+++ b/misc/gperiodic/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:12 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/05/10 01:31:25 jtb Exp $
 
-SHA1 (gperiodic-1.2.6.tar.gz) = e188c725cc443f1029bf8a7156a2d16171bcbe36
-Size (gperiodic-1.2.6.tar.gz) = 140651 bytes
-SHA1 (patch-aa) = 55fc5b2d5751115e27a9e97613603a1b854384ea
+SHA1 (gperiodic-2.0.4.tar.gz) = 0bb22ec25dbddf75c296a59345182d234e465ac1
+Size (gperiodic-2.0.4.tar.gz) = 39868 bytes
+SHA1 (patch-aa) = 992911a0502c39a30db81179d764590c62bd57d0
+SHA1 (patch-ab) = 24058fac21d3418a11752cb8ca2cd9777c7350d1
+SHA1 (patch-ac) = a43ecea0b7807fd1c2b537033a4c8d038f461422
diff --git a/misc/gperiodic/patches/patch-aa b/misc/gperiodic/patches/patch-aa
index a23500825cb..39ef29978c8 100644
--- a/misc/gperiodic/patches/patch-aa
+++ b/misc/gperiodic/patches/patch-aa
@@ -1,13 +1,37 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/15 03:22:33 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/10 01:31:26 jtb Exp $
 
---- configure.orig	Wed Sep  8 09:27:05 1999
-+++ configure	Tue Sep 14 19:31:05 1999
-@@ -710,7 +710,7 @@
+--- Makefile.orig
++++ Makefile
+@@ -1,13 +1,11 @@
+-CC=gcc
+-CFLAGS=`pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++CC?=gcc
++CFLAGS+=`pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+ LIBS=`pkg-config --libs gtk+-2.0`
  
- PACKAGE=gperiodic
+-.c.o:
+-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
++all:	gperiodic
  
--VERSION=1.2.5
-+VERSION=1.2.6
+ gperiodic: gperiodic.o
+ 	$(CC) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS)
+-	strip gperiodic
  
- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+ gpdata.o: gpdata.c gperiodic.h
+ 
+@@ -17,10 +15,11 @@
+ 	rm *.o gperiodic
+ 
+ install:
+-	make -C po/ install enable_nls=1
+-	cp gperiodic /usr/local/bin
+-	cp gperiodic.desktop /usr/share/applications
+-	cp gperiodic.png /usr/share/pixmaps
++	cd po && $(MAKE) install enable_nls=1
++	$(BSD_INSTALL_PROGRAM) gperiodic $(PREFIX)/bin
++	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/gnome/apps/Applications
++	$(BSD_INSTALL_DATA) gperiodic.desktop $(PREFIX)/share/gnome/apps/Applications
++	$(BSD_INSTALL_DATA) gperiodic.png $(PREFIX)/share/pixmaps
+ 
+ uninstall:
+ 	rm /usr/local/bin/gperiodic
diff --git a/misc/gperiodic/patches/patch-ab b/misc/gperiodic/patches/patch-ab
new file mode 100644
index 00000000000..561bf768d01
--- /dev/null
+++ b/misc/gperiodic/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.1 2003/05/10 01:31:26 jtb Exp $
+
+--- po/Makefile.orig
++++ po/Makefile
+@@ -3,23 +3,23 @@
+ PACKAGE ?= gperiodic
+ CWD = po
+ MSGFMT = msgfmt
+-SUB_DIRS = 
++SUB_DIRS =
+ FILES_PO:=$(wildcard *.po)
+ FILES_MO:=$(FILES_PO:.po=.mo)
+ 
+-LOCALEDIR ?= /usr/share/locale
+-MSGFMT_OPT ?= -f -v -o
++LOCALEDIR ?= $(PREFIX)/$(PKGLOCALEDIR)/locale
++MSGFMT_OPT ?= -f -o
+ 
+ ifeq ($(enable_nls),1)
+ all: mo-files
+ 
+ mo-files: $(FILES_MO)
+ 
+-install: 
++install:
+ 	$(MAKE) all
+-	for f in $(FILES_MO) ; do mkdir -p \
+-		$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
+-		cp $$f $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
++	for f in $(FILES_MO) ; do $(BSD_INSTALL_DATA_DIR) \
++		$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
++		$(BSD_INSTALL_DATA) $$f $(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
+ 
+ %.mo: %.po
+ 	$(MSGFMT) $(MSGFMT_OPT) $@ $<
+@@ -34,4 +34,3 @@
+ 
+ clean:
+ 	$(RM) $(FILES_MO)
+-
diff --git a/misc/gperiodic/patches/patch-ac b/misc/gperiodic/patches/patch-ac
new file mode 100644
index 00000000000..5eb55b7f748
--- /dev/null
+++ b/misc/gperiodic/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/05/10 01:31:26 jtb Exp $
+
+--- gperiodic.c.orig
++++ gperiodic.c
+@@ -413,7 +413,7 @@
+ 
+ 
+ int main(int argc, char** argv) {
+-  char ch;
++  signed char ch;
+ 
+     textdomain (PACKAGE);
+     bindtextdomain(PACKAGE, GPERIODIC_LOCALE_DIR);