diff options
-rw-r--r-- | misc/gperiodic/Makefile | 18 | ||||
-rw-r--r-- | misc/gperiodic/PLIST | 9 | ||||
-rw-r--r-- | misc/gperiodic/distinfo | 16 | ||||
-rw-r--r-- | misc/gperiodic/patches/patch-aa | 57 | ||||
-rw-r--r-- | misc/gperiodic/patches/patch-ab | 40 | ||||
-rw-r--r-- | misc/gperiodic/patches/patch-ac | 8 | ||||
-rw-r--r-- | misc/gperiodic/patches/patch-ad | 4 |
7 files changed, 67 insertions, 85 deletions
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index d04c11bde17..c0928ce3dc2 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.48 2010/09/14 11:02:24 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2010/09/19 02:18:42 obache Exp $ -DISTNAME= gperiodic-2.0.8 -PKGREVISION= 6 +DISTNAME= gperiodic-2.0.10 CATEGORIES= misc x11 -MASTER_SITES= # http://www.frantz.fi/software/ +MASTER_SITES= http://www.frantz.fi/software/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.frantz.fi/software/gperiodic.php COMMENT= Displays a periodic table of the elements +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -19,14 +19,12 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED -MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +MAKE_FLAGS+= bindir=${PREFIX}/bin +MAKE_FLAGS+= datadir=${PREFIX}/share +MAKE_FLAGS+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale BUILD_TARGET= gperiodic -LIBS+= -lintl -MAKE_ENV+= LIBS=${LIBS:M*:Q} - -INSTALLATION_DIRS= bin share/gnome/apps/Applications share/pixmaps - .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gperiodic/PLIST b/misc/gperiodic/PLIST index 393b9f4818a..e1bac9b57a9 100644 --- a/misc/gperiodic/PLIST +++ b/misc/gperiodic/PLIST @@ -1,10 +1,13 @@ -@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:25 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2010/09/19 02:18:42 obache Exp $ bin/gperiodic -share/gnome/apps/Applications/gperiodic.desktop +share/applications/gperiodic.desktop share/locale/da/LC_MESSAGES/gperiodic.mo share/locale/fr/LC_MESSAGES/gperiodic.mo +share/locale/gl/LC_MESSAGES/gperiodic.mo +share/locale/it/LC_MESSAGES/gperiodic.mo share/locale/pl/LC_MESSAGES/gperiodic.mo +share/locale/ru/LC_MESSAGES/gperiodic.mo share/locale/sv/LC_MESSAGES/gperiodic.mo share/locale/tr/LC_MESSAGES/gperiodic.mo -share/pixmaps/gperiodic.png share/pixmaps/gperiodic-crystal.png +share/pixmaps/gperiodic.png diff --git a/misc/gperiodic/distinfo b/misc/gperiodic/distinfo index b2fb9f97e57..0c627f165b1 100644 --- a/misc/gperiodic/distinfo +++ b/misc/gperiodic/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2008/06/20 01:09:26 joerg Exp $ +$NetBSD: distinfo,v 1.11 2010/09/19 02:18:42 obache Exp $ -SHA1 (gperiodic-2.0.8.tar.gz) = b9d41c02ee8724b799280c7493aa2bb15a2d5cea -RMD160 (gperiodic-2.0.8.tar.gz) = e799208c2233fbc9530c8e0b6a34fbcdba97931f -Size (gperiodic-2.0.8.tar.gz) = 125402 bytes -SHA1 (patch-aa) = 68ab285a7a112cf3b118a7a26c47501aafa7487b -SHA1 (patch-ab) = fdc23a99123e334c7dae7a84645a567a33a443cf -SHA1 (patch-ac) = b46b521544d4dff146e8b71e66ac8811b6b8525f -SHA1 (patch-ad) = 0ec076c13f652737459c2b1bf680338c5da52016 +SHA1 (gperiodic-2.0.10.tar.gz) = ce7a4d5271aaf283afa0c8299b2ee9b04da257fe +RMD160 (gperiodic-2.0.10.tar.gz) = 9a4a16c4578342b4044d93e3327623cec98c762e +Size (gperiodic-2.0.10.tar.gz) = 131213 bytes +SHA1 (patch-aa) = e567c8ea59d706907e9ea590d16594ba0220d5f7 +SHA1 (patch-ab) = 62130bdaf40eaf6fa22aa21d3575b75420098559 +SHA1 (patch-ac) = af500f07ce27927a301729c6f0a6da5ac8fda9cc +SHA1 (patch-ad) = d5bdaabfc1de84810547ceabc3116914adb8e782 diff --git a/misc/gperiodic/patches/patch-aa b/misc/gperiodic/patches/patch-aa index 9517b980801..1385525c19c 100644 --- a/misc/gperiodic/patches/patch-aa +++ b/misc/gperiodic/patches/patch-aa @@ -1,36 +1,35 @@ -$NetBSD: patch-aa,v 1.6 2008/06/20 01:09:26 joerg Exp $ +$NetBSD: patch-aa,v 1.7 2010/09/19 02:18:42 obache Exp $ ---- Makefile.orig 2003-08-10 05:33:27.000000000 +1000 +--- Makefile.orig 2007-07-11 12:58:05.000000000 +0000 +++ Makefile -@@ -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 --LIBS=`pkg-config --libs gtk+-2.0` --bindir ?= /usr/bin --datadir ?= /usr/share -+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 ?= ${PREFIX}/bin -+datadir ?= ${PREFIX}/share - - .c.o: - $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -@@ -16,12 +16,11 @@ gpdata.o: gpdata.c gperiodic.h +@@ -1,6 +1,6 @@ +-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` ++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 + enable_nls ?= 1 +@@ -23,13 +23,13 @@ gpdata.o: gpdata.c gperiodic.h gperiodic.o: gperiodic.c gperiodic.h table_data.h install: -- 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 ${DESTDIR}$(bindir) -+ ${BSD_INSTALL_DATA} gperiodic.desktop ${DESTDIR}${PREFIX}/share/gnome/apps/Applications -+ ${BSD_INSTALL_DATA} gperiodic.png ${DESTDIR}$(datadir)/pixmaps -+ ${BSD_INSTALL_DATA} gperiodic-crystal.png ${DESTDIR}$(datadir)/pixmaps +- mkdir -p $(DESTDIR)$(bindir) +- install -m 755 gperiodic $(DESTDIR)$(bindir) +- mkdir -p $(DESTDIR)$(datadir)/applications +- install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications +- mkdir -p $(DESTDIR)$(datadir)/pixmaps +- install -m 644 gperiodic.png $(DESTDIR)$(datadir)/pixmaps +- install -m 644 gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps ++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) ++ $(BSD_INSTALL_PROGRAM) gperiodic $(DESTDIR)$(bindir) ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(datadir)/applications ++ $(BSD_INSTALL_DATA) gperiodic.desktop $(DESTDIR)$(datadir)/applications ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(datadir)/pixmaps ++ $(BSD_INSTALL_DATA) gperiodic.png $(DESTDIR)$(datadir)/pixmaps ++ $(BSD_INSTALL_DATA) gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps + make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) uninstall: - rm $(bindir)/gperiodic diff --git a/misc/gperiodic/patches/patch-ab b/misc/gperiodic/patches/patch-ab index 3c5d43bcd06..2b089ed641c 100644 --- a/misc/gperiodic/patches/patch-ab +++ b/misc/gperiodic/patches/patch-ab @@ -1,33 +1,15 @@ -$NetBSD: patch-ab,v 1.3 2008/06/20 01:09:26 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2010/09/19 02:18:42 obache Exp $ ---- po/Makefile.orig 2003-08-09 21:34:22.000000000 +0200 +--- po/Makefile.orig 2007-07-11 12:58:05.000000000 +0000 +++ po/Makefile -@@ -8,8 +8,8 @@ FILES_PO:=$(wildcard *.po) - FILES_MO:=$(FILES_PO:.po=.mo) - datadir ?= /usr/share - --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) - +@@ -27,8 +27,8 @@ endif install: $(MAKE) all -- for f in $(FILES_MO) ; do mkdir -p \ -+ for f in $(FILES_MO) ; do $(BSD_INSTALL_DATA_DIR) \ -- $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \ -+ ${DESTDIR}$(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 ${DESTDIR}$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done - - %.mo: %.po - $(MSGFMT) $(MSGFMT_OPT) $@ $< -@@ -35,4 +35,3 @@ endif - - clean: - $(RM) $(FILES_MO) -- + for f in $(FILES_MO) ; do \ +- mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \ +- install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \ ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \ ++ $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \ + done + + uninstall: diff --git a/misc/gperiodic/patches/patch-ac b/misc/gperiodic/patches/patch-ac index c4fbf0c7797..71468ead071 100644 --- a/misc/gperiodic/patches/patch-ac +++ b/misc/gperiodic/patches/patch-ac @@ -1,12 +1,12 @@ -$NetBSD: patch-ac,v 1.4 2003/12/14 12:38:30 wiz Exp $ +$NetBSD: patch-ac,v 1.5 2010/09/19 02:18:42 obache Exp $ ---- gperiodic.c.orig 2003-10-13 13:43:49.000000000 +0200 +--- gperiodic.c.orig 2007-07-11 13:01:34.000000000 +0000 +++ gperiodic.c -@@ -415,7 +415,7 @@ void main_prog(void) +@@ -408,7 +408,7 @@ void main_prog(void) int main(int argc, char** argv) { -- char ch; +- signed char ch; + int ch; textdomain (PACKAGE); diff --git a/misc/gperiodic/patches/patch-ad b/misc/gperiodic/patches/patch-ad index 116a647290d..d5f65b9dd6d 100644 --- a/misc/gperiodic/patches/patch-ad +++ b/misc/gperiodic/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2005/04/26 14:53:02 drochner Exp $ +$NetBSD: patch-ad,v 1.2 2010/09/19 02:18:42 obache Exp $ ---- table_data.h.orig 2003-10-10 09:44:45.000000000 +0200 +--- table_data.h.orig 2007-07-11 12:58:05.000000000 +0000 +++ table_data.h @@ -181,13 +181,13 @@ struct table_entry table [ELEMENTNUM+1] {N_("Cobalt"), "Co", "27", "58.9332", "8.9", "1768", "3143", "125", "116", "63 (+3e) 72 (+2e)", "6.7", "0.456", "15.48", "389.1", "100", "385.00", "1.88", "758.1", "3, 2, 0, -1", "[Ar] 3d<sup>7</sup> 4s<sup>2</sup>", "HEX", "2.510", N_("n/a"), N_("Hard, ductile, lustrous bluish-gray metal"), N_("1739 (Sweden)"), N_("George Brandt"), N_("German: kobold (goblin)."), 9, 4, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, |