From 4969e448668387dd2f74f124bc40f8c9bbb36887 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 14 Dec 2003 12:38:30 +0000 Subject: Update to 2.0.7: # 2.0.7 : Minor feature addition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. --- misc/gperiodic/Makefile | 6 +++--- misc/gperiodic/PLIST | 4 +++- misc/gperiodic/distinfo | 12 +++++------ misc/gperiodic/patches/patch-aa | 46 ++++++++++++++++++++--------------------- misc/gperiodic/patches/patch-ab | 30 ++++++++++----------------- misc/gperiodic/patches/patch-ac | 6 +++--- 6 files changed, 48 insertions(+), 56 deletions(-) (limited to 'misc') diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index d257511bca8..0ebef88e189 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2003/12/13 00:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2003/12/14 12:38:30 wiz Exp $ -DISTNAME= gperiodic-2.0.5 -PKGREVISION= 1 +DISTNAME= gperiodic-2.0.7 CATEGORIES= misc x11 MASTER_SITES= http://www.acclab.helsinki.fi/~frantz/software/ @@ -18,6 +17,7 @@ USE_X11= # defined USE_GMAKE= # defined MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +ALL_TARGET= gperiodic .include "../../devel/gettext-lib/buildlink2.mk" .include "../../x11/gtk2/buildlink2.mk" diff --git a/misc/gperiodic/PLIST b/misc/gperiodic/PLIST index 5a069dacf24..4860faf8720 100644 --- a/misc/gperiodic/PLIST +++ b/misc/gperiodic/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2003/07/30 14:05:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/12/14 12:38:30 wiz Exp $ bin/gperiodic share/gnome/apps/Applications/gperiodic.desktop ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gperiodic.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gperiodic.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gperiodic.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gperiodic.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gperiodic.mo share/pixmaps/gperiodic.png share/pixmaps/gperiodic-crystal.png diff --git a/misc/gperiodic/distinfo b/misc/gperiodic/distinfo index c621c85ee31..33598a8ebb1 100644 --- a/misc/gperiodic/distinfo +++ b/misc/gperiodic/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2003/07/30 14:05:26 wiz Exp $ +$NetBSD: distinfo,v 1.6 2003/12/14 12:38:30 wiz Exp $ -SHA1 (gperiodic-2.0.5.tar.gz) = 25f94b175c91c772a7157355617fc75088528efa -Size (gperiodic-2.0.5.tar.gz) = 47663 bytes -SHA1 (patch-aa) = 2ae8d15525aa868ed95ac4b03d0fb247850919c7 -SHA1 (patch-ab) = 24058fac21d3418a11752cb8ca2cd9777c7350d1 -SHA1 (patch-ac) = 1465c4c96a0b848773cce15041e02b5efa025f2e +SHA1 (gperiodic-2.0.7.tar.gz) = fa1277c4f1d34fbdb2da95b38a6b7f59e23caf03 +Size (gperiodic-2.0.7.tar.gz) = 124798 bytes +SHA1 (patch-aa) = 9fe15e0b2cf721db3f4618cec7763f300b2cad69 +SHA1 (patch-ab) = 6f79492b0ce20681288323c8b113f6240a649bb2 +SHA1 (patch-ac) = b46b521544d4dff146e8b71e66ac8811b6b8525f 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) { -- cgit v1.2.3