Update to 2.0.7:

# 2.0.7 : Minor feature addition

    * Change translations to include descriptions of elements.
    * Turkish translation contributed by Osman Köseli.

# 2.0.6 : Minor bug fixes and feature addition

    * Sebastien Bacher provided french translation and patched some translation bugs.
    * Fixed some minor bugs in the internationalisation support.
    * Minor fix of Makefile to improve .rpm generation.

3 files changed, 36 insertions, 46 deletions

diff --git a/misc/gperiodic/patches/patch-aa b/misc/gperiodic/patches/patch-aa
index 6f78ef05345..77b9aa193d7 100644
--- a/misc/gperiodic/patches/patch-aa
+++ b/misc/gperiodic/patches/patch-aa
@@ -1,37 +1,35 @@
-$NetBSD: patch-aa,v 1.3 2003/07/30 14:05:27 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/14 12:38:30 wiz Exp $
 
---- Makefile.orig	Fri Jul 25 09:26:15 2003
+--- Makefile.orig	2003-08-09 21:33:27.000000000 +0200
 +++ Makefile
-@@ -1,24 +1,22 @@
+@@ -1,8 +1,8 @@
 -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`
+-bindir ?= /usr/bin
+-datadir ?= /usr/share
++bindir ?= ${PREFIX}/bin
++datadir ?= ${PREFIX}/share
  
--.c.o:
--	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-+all:	gperiodic
- 
- gperiodic: gperiodic.o
- 	$(CC) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS)
--	strip gperiodic
- 
- gpdata.o: gpdata.c gperiodic.h
- 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
+@@ -16,12 +16,11 @@ gpdata.o: gpdata.c gperiodic.h
  gperiodic.o: gperiodic.c gperiodic.h table_data.h
  
  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
--	cp gperiodic-crystal.png /usr/share/pixmaps
-+	cd po && ${MAKE} install enable_nls=1
-+	${BSD_INSTALL_PROGRAM} gperiodic ${PREFIX}/bin
+-	make -C po/ install enable_nls=1 datadir=$(datadir)
+-	install gperiodic $(bindir)
+-	install gperiodic.desktop $(datadir)/applications
+-	install gperiodic.png $(datadir)/pixmaps
+-	install gperiodic-crystal.png $(datadir)/pixmaps
+-	make clean
++	cd po && ${MAKE} install enable_nls=1 datadir=$(datadir)
++	${BSD_INSTALL_PROGRAM} gperiodic $(bindir)
 +	${BSD_INSTALL_DATA} gperiodic.desktop ${PREFIX}/share/gnome/apps/Applications
-+	${BSD_INSTALL_DATA} gperiodic.png ${PREFIX}/share/pixmaps
-+	${BSD_INSTALL_DATA} gperiodic-crystal.png ${PREFIX}/share/pixmaps
- 	make clean
++	${BSD_INSTALL_DATA} gperiodic.png $(datadir)/pixmaps
++	${BSD_INSTALL_DATA} gperiodic-crystal.png $(datadir)/pixmaps
+ 
  uninstall:
- 	rm /usr/local/bin/gperiodic
+ 	rm $(bindir)/gperiodic
diff --git a/misc/gperiodic/patches/patch-ab b/misc/gperiodic/patches/patch-ab
index 561bf768d01..a3a05485181 100644
--- a/misc/gperiodic/patches/patch-ab
+++ b/misc/gperiodic/patches/patch-ab
@@ -1,39 +1,31 @@
-$NetBSD: patch-ab,v 1.1 2003/05/10 01:31:26 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/14 12:38:30 wiz Exp $
 
---- po/Makefile.orig
+--- po/Makefile.orig	2003-08-09 21:34:22.000000000 +0200
 +++ po/Makefile
-@@ -3,23 +3,23 @@
- PACKAGE ?= gperiodic
- CWD = po
- MSGFMT = msgfmt
--SUB_DIRS = 
-+SUB_DIRS =
- FILES_PO:=$(wildcard *.po)
+@@ -8,8 +8,8 @@ FILES_PO:=$(wildcard *.po)
  FILES_MO:=$(FILES_PO:.po=.mo)
+ datadir ?= /usr/share
  
--LOCALEDIR ?= /usr/share/locale
+-LOCALEDIR ?= $(datadir)/locale
 -MSGFMT_OPT ?= -f -v -o
 +LOCALEDIR ?= $(PREFIX)/$(PKGLOCALEDIR)/locale
 +MSGFMT_OPT ?= -f -o
  
  ifeq ($(enable_nls),1)
  all: mo-files
+@@ -18,9 +18,9 @@ mo-files: $(FILES_MO)
  
- mo-files: $(FILES_MO)
- 
--install: 
-+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
+ 		$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
+-		cp $$f $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
++		$(BSD_INSTALL_DATA) $$f $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
  
  %.mo: %.po
  	$(MSGFMT) $(MSGFMT_OPT) $@ $<
-@@ -34,4 +34,3 @@
+@@ -35,4 +35,3 @@ endif
  
  clean:
  	$(RM) $(FILES_MO)
diff --git a/misc/gperiodic/patches/patch-ac b/misc/gperiodic/patches/patch-ac
index 3da27efab06..c4fbf0c7797 100644
--- a/misc/gperiodic/patches/patch-ac
+++ b/misc/gperiodic/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2003/07/30 14:05:27 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2003/12/14 12:38:30 wiz Exp $
 
---- gperiodic.c.orig	Fri Jul 25 09:15:29 2003
+--- gperiodic.c.orig	2003-10-13 13:43:49.000000000 +0200
 +++ gperiodic.c
-@@ -414,7 +414,7 @@ void main_prog(void)
+@@ -415,7 +415,7 @@ void main_prog(void)
  
  
  int main(int argc, char** argv) {