NetBSD Problem Report #43779

From www@NetBSD.org  Wed Aug 18 23:42:39 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 1506063BBEB
	for <gnats-bugs@gnats.NetBSD.org>; Wed, 18 Aug 2010 23:42:39 +0000 (UTC)
Message-Id: <20100818234238.BAADA63BBBD@www.NetBSD.org>
Date: Wed, 18 Aug 2010 23:42:38 +0000 (UTC)
From: kamelderouiche@yahoo.com
Reply-To: kamelderouiche@yahoo.com
To: gnats-bugs@NetBSD.org
Subject: Update misc/gperiodic to 2.0.10
X-Send-Pr-Version: www-1.0

>Number:         43779
>Category:       pkg
>Synopsis:       Update misc/gperiodic to 2.0.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    obache
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 18 23:45:02 +0000 2010
>Closed-Date:    Sun Sep 19 02:20:42 +0000 2010
>Last-Modified:  Sun Sep 19 02:35:01 +0000 2010
>Originator:     Derouiche
>Release:        NetBSD 5.0.2
>Organization:
>Environment:
NetBSD Khaarasan 5.0.2 NetBSD 5.0.2 (GENERIC) #0: Sat Feb  6 17:53:27 UTC 2010  builds@b7.netbsd.org:/home/builds/ab/netbsd-5-0-2-RELEASE/i386/201002061851Z-obj/home/builds/ab/netbsd-5-0-2-RELEASE/src/sys/arch/i386/compile/GENERIC i386
>Description:
pkgsrc-changes:
==============
o patch-ac (remove)
o proposal change category move to biology

please review
>How-To-Repeat:
n/a
>Fix:
$ diff -ruN Makefile.orig Makefile
--- Makefile.orig	2010-08-18 14:30:30.000000000 +0000
+++ Makefile	2010-08-19 00:21:05.000000000 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.46 2009/08/26 19:58:01 sno Exp $
+# $NetBSD$
+#

-DISTNAME=		gperiodic-2.0.8
-PKGREVISION=		5
-CATEGORIES=		misc x11
-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
+DISTNAME=	gperiodic-2.0.10
+CATEGORIES=	biology misc
+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

@@ -25,8 +26,9 @@
 LIBS+=			-lintl
 MAKE_ENV+=		LIBS=${LIBS:M*:Q}

-INSTALLATION_DIRS=	bin share/gnome/apps/Applications share/pixmaps
+INSTALLATION_DIRS=	bin share/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 -ruN PLIST.orig PLIST
--- PLIST.orig	2010-08-18 14:30:30.000000000 +0000
+++ PLIST	2010-08-19 00:18:05.000000000 +0000
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/14 12:38:30 wiz Exp $
+@comment $NetBSD$
 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 -ruN distinfo.orig distinfo
--- distinfo.orig	2010-08-18 14:30:30.000000000 +0000
+++ distinfo	2010-08-19 00:29:33.000000000 +0000
@@ -1,9 +1,8 @@
 $NetBSD: distinfo,v 1.9 2005/08/26 13:59:21 grant 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 (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) = 3939a01bb82ff29ef775bff7c6054f565982ecb5
+SHA1 (patch-ab) = e76492a521820bc9f2572a55797bf2782afd0beb
 SHA1 (patch-ad) = 0ec076c13f652737459c2b1bf680338c5da52016

$ diff -ruN ./patches.orig/patch-aa ./patches/patch-aa 
--- ./patches.orig/patch-aa	2010-08-18 14:30:30.000000000 +0000
+++ ./patches/patch-aa	2010-08-19 00:29:09.000000000 +0000
@@ -1,36 +1,37 @@
-$NetBSD: patch-aa,v 1.5 2005/08/26 13:59:22 grant Exp $
+$NetBSD$

---- Makefile.orig	2003-08-10 05:33:27.000000000 +1000
-+++ Makefile
+--- Makefile.orig	2010-08-19 00:04:09.000000000 +0000
++++ Makefile	2010-08-19 00:13:30.000000000 +0000
 @@ -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`
+-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
++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
+ enable_nls ?= 1

  .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
+@@ -24,13 +24,13 @@

  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)
++	${BSD_INSTALL_DATA} gperiodic $(DESTDIR)$(bindir)
+ 	mkdir -p $(DESTDIR)$(datadir)/applications
+-	install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications
++	${BSD_INSTALL_DATA} 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
+-	make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
++	${BSD_INSTALL_DATA} gperiodic.png $(DESTDIR)$(datadir)/pixmaps
++	${BSD_INSTALL_DATA} gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps
++	cd po && ${MAKE} install enable_nls=1 datadir=$(datadir) DESTDIR=$(DESTDIR)

  uninstall:
- 	rm $(bindir)/gperiodic
+ 	rm -f $(bindir)/gperiodic \

$ diff -ruN ./patches.orig/patch-ab ./patches/patch-ab
--- ./patches.orig/patch-ab	2010-08-18 14:30:30.000000000 +0000
+++ ./patches/patch-ab	2010-08-19 00:29:19.000000000 +0000
@@ -1,33 +1,24 @@
-$NetBSD: patch-ab,v 1.2 2003/12/14 12:38:30 wiz Exp $
+$NetBSD$

---- po/Makefile.orig	2003-08-09 21:34:22.000000000 +0200
-+++ po/Makefile
-@@ -8,8 +8,8 @@ FILES_PO:=$(wildcard *.po)
- FILES_MO:=$(FILES_PO:.po=.mo)
+--- ./po/Makefile.orig	2010-08-18 23:54:46.000000000 +0000
++++ ./po/Makefile	2010-08-18 23:57:37.000000000 +0000
+@@ -7,8 +7,8 @@
  datadir ?= /usr/share
+ enable_nls ?= 1

 -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)
+ 
+ .SUFFIXES: .mo .po
+@@ -26,7 +26,7 @@

  install: 
  	$(MAKE) all
--	for f in $(FILES_MO) ; do mkdir -p \
+-	for f in $(FILES_MO) ; do \
 +	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)
--
+ 		mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
+ 		install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \
+ 	done



>Release-Note:

>Audit-Trail:
From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/43779: Update misc/gperiodic to 2.0.10
Date: Sun, 22 Aug 2010 17:21:00 +0900

 On Thu, 19 Aug 2010 08:45:02 +0900, <kamelderouiche@yahoo.com> wrote:

 > pkgsrc-changes:
 > ==============
 > o patch-ac (remove)
 > o proposal change category move to biology
 >
 > please review

 I don't think that periodic table should be in biology.
 Why do you think so?

 Please make to patch minimize.
 In Makefile, many of changes is just differs of indents.

Responsible-Changed-From-To: pkg-manager->obache
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Sun, 19 Sep 2010 02:20:42 +0000
Responsible-Changed-Why:
I've updated this package.


State-Changed-From-To: open->closed
State-Changed-By: obache@NetBSD.org
State-Changed-When: Sun, 19 Sep 2010 02:20:42 +0000
State-Changed-Why:
Updated.  Thanks!


From: OBATA Akio <obache@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/43779 CVS commit: pkgsrc/misc/gperiodic
Date: Sun, 19 Sep 2010 02:18:43 +0000

 Module Name:	pkgsrc
 Committed By:	obache
 Date:		Sun Sep 19 02:18:42 UTC 2010

 Modified Files:
 	pkgsrc/misc/gperiodic: Makefile PLIST distinfo
 	pkgsrc/misc/gperiodic/patches: patch-aa patch-ab patch-ac patch-ad

 Log Message:
 Update gpriodic to 2.0.10.
 Based on PR#43779 by Kamel Derouich, with some improvements by me.

 2.0.10 : Minor code update & include translations
  * Use the standard gtk+ about window
  * Include the russian translation contributed by Michael Shigorin
 2.0.9 : Minor code update & include translations
  * Several minor fixed contributed from the Debian project has been merged.
  * Italian and galician translations have been included.


 To generate a diff of this commit:
 cvs rdiff -u -r1.48 -r1.49 pkgsrc/misc/gperiodic/Makefile
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/gperiodic/PLIST
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/gperiodic/distinfo
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/gperiodic/patches/patch-aa
 cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/gperiodic/patches/patch-ab
 cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/gperiodic/patches/patch-ac
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/gperiodic/patches/patch-ad

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

Home	PR Database Search