From owner-freebsd-gnome@FreeBSD.ORG Fri Jun 27 06:31:13 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4528437B401 for ; Fri, 27 Jun 2003 06:31:13 -0700 (PDT) Received: from httpd1.terions.de (static62-99-146-055.adsl.inode.at [62.99.146.55]) by mx1.FreeBSD.org (Postfix) with SMTP id 12EF943FEC for ; Fri, 27 Jun 2003 06:31:11 -0700 (PDT) (envelope-from martin@kleinerdrache.org) Received: (qmail 96976 invoked by uid 0); 27 Jun 2003 13:31:07 -0000 Date: 27 Jun 2003 13:31:07 -0000 Message-ID: <20030627133107.96975.qmail@httpd1.terions.de> To: FreeBSD-gnats-submit@freebsd.org From: Martin Klaffenboeck X-send-pr-version: 3.113 X-GNATS-Notify: cc: gnome@freebsd.org Subject: [update] gdeskcal X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Martin Klaffenboeck List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2003 13:31:13 -0000 >Submitter-Id: current-users >Originator: Martin Klaffenboeck >Organization: >Confidential: no >Synopsis: [update] gdeskcal >Severity: non-critical >Priority: low >Category: ports >Class: maintainer-update >Release: FreeBSD 4.8-STABLE i386 >Environment: System: FreeBSD martin.kleinerdrache.org 4.8-STABLE FreeBSD 4.8-STABLE #3: Sun Jun 22 21:36:41 CEST 2003 martin@martin.kleinerdrache.org:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: This is the update for gdeskcal and gdeskcal-skins to 0.53. (Two files attached.) The miderat skin has changed from gdeskcal-skins to gdeskcal by the author of gdeskcal. So now we have a problem. If the user runs: portupgrade gdeskcal gdeskcal-skins The gdeskcal will be updated first, because the skins depend on this port. So now, gdeskcal installs the miderat skin. The checksums are the same as if they were installed by the skins. So now gdeskcal is installed and gdeskcal-skins will be deleted, which delete the miderat skin. The miderat skin is now away, because gdeskcal-skins do not install them again. (But it does delete them at this point, because the package registry does contain the files on a system where gdeskcal-skins is installed.) We can solve that by doing: pkg_delete gdeskcal-skins-0.50 portupgrade gdeskcal -N gdeskcal-skins (I think there is no way to change the ports so it does it by itselfe.) Martin >How-To-Repeat: >Fix: --- gdeskcal.diff begins here --- diff -Nur gdeskcal.orig/Makefile gdeskcal/Makefile --- gdeskcal.orig/Makefile Thu Jun 26 21:12:03 2003 +++ gdeskcal/Makefile Fri Jun 27 14:46:49 2003 @@ -6,8 +6,7 @@ # PORTNAME= gdeskcal -PORTVERSION= 0.52 -PORTREVISION= 1 +PORTVERSION= 0.53 CATEGORIES= deskutils python gnome MASTER_SITES= http://www.pycage.de/download/ DISTNAME= gDeskCal-${PORTVERSION:S/./_/} @@ -44,7 +43,8 @@ ${MKDIR} ${PREFIX}/share/locale/ar/LC_MESSAGES -.for i in ar cs de el es fr he hu it ja ko nl ru tr zh_CN +.for i in ar bg cs de de_AT el es fi fr he hu is it \ + ja ko lt nl no pl ru sv tr zh_CN ${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/locale/${i}/LC_MESSAGES/gdeskcal.mo \ ${PREFIX}/share/locale/${i}/LC_MESSAGES diff -Nur gdeskcal.orig/distinfo gdeskcal/distinfo --- gdeskcal.orig/distinfo Tue Jun 10 09:13:09 2003 +++ gdeskcal/distinfo Fri Jun 27 14:36:28 2003 @@ -1 +1 @@ -MD5 (gDeskCal-0_52.tar.gz) = 039a0e7ccd2c17b27802f4e60b415e79 +MD5 (gDeskCal-0_53.tar.gz) = bc60c0962569b94f16909ed79eea776e diff -Nur gdeskcal.orig/pkg-plist gdeskcal/pkg-plist --- gdeskcal.orig/pkg-plist Thu Jun 26 21:12:03 2003 +++ gdeskcal/pkg-plist Fri Jun 27 14:49:19 2003 @@ -55,21 +55,37 @@ share/gnome/gdeskcal/skins/default/skin.xml share/gnome/gdeskcal/skins/default/today.png share/gnome/gdeskcal/skins/big_and_simple/skin.xml +share/gnome/gdeskcal/skins/miderat/bg.png +share/gnome/gdeskcal/skins/miderat/bg.xcf +share/gnome/gdeskcal/skins/miderat/home.png +share/gnome/gdeskcal/skins/miderat/next.png +share/gnome/gdeskcal/skins/miderat/prev.png +share/gnome/gdeskcal/skins/miderat/skin.xml +share/gnome/gdeskcal/skins/miderat/today.png share/locale/ar/LC_MESSAGES/gdeskcal.mo +share/locale/bg/LC_MESSAGES/gdeskcal.mo share/locale/cs/LC_MESSAGES/gdeskcal.mo share/locale/de/LC_MESSAGES/gdeskcal.mo +share/locale/de_AT/LC_MESSAGES/gdeskcal.mo share/locale/el/LC_MESSAGES/gdeskcal.mo share/locale/es/LC_MESSAGES/gdeskcal.mo +share/locale/fi/LC_MESSAGES/gdeskcal.mo share/locale/fr/LC_MESSAGES/gdeskcal.mo share/locale/he/LC_MESSAGES/gdeskcal.mo share/locale/hu/LC_MESSAGES/gdeskcal.mo +share/locale/is/LC_MESSAGES/gdeskcal.mo share/locale/it/LC_MESSAGES/gdeskcal.mo share/locale/ja/LC_MESSAGES/gdeskcal.mo share/locale/ko/LC_MESSAGES/gdeskcal.mo +share/locale/lt/LC_MESSAGES/gdeskcal.mo share/locale/nl/LC_MESSAGES/gdeskcal.mo +share/locale/no/LC_MESSAGES/gdeskcal.mo +share/locale/pl/LC_MESSAGES/gdeskcal.mo share/locale/ru/LC_MESSAGES/gdeskcal.mo +share/locale/sv/LC_MESSAGES/gdeskcal.mo share/locale/tr/LC_MESSAGES/gdeskcal.mo share/locale/zh_CN/LC_MESSAGES/gdeskcal.mo +@dirrm share/gnome/gdeskcal/skins/miderat @dirrm share/gnome/gdeskcal/skins/default @dirrm share/gnome/gdeskcal/skins/big_and_simple @dirrm share/gnome/gdeskcal/skins --- gdeskcal.diff ends here --- --- gdeskcal-skins.diff begins here --- diff -Nur gdeskcal-skins.orig/Makefile gdeskcal-skins/Makefile --- gdeskcal-skins.orig/Makefile Mon May 5 02:22:57 2003 +++ gdeskcal-skins/Makefile Fri Jun 27 14:50:45 2003 @@ -6,18 +6,16 @@ # PORTNAME= gdeskcal-skins -PORTVERSION= 0.50 +PORTVERSION= 0.53 CATEGORIES= deskutils python gnome MASTER_SITES= http://www.pycage.de/download/skins/gdeskcal/ DISTNAME= DISTFILES= gnometheme.tar.gz \ SimpleForDark.tar.gz \ e_01.tar.gz \ - miderat_RTL.tar.gz \ light_01.tar.gz \ light_02.tar.gz \ tnf.tar.gz \ - miderat_v2.tar.gz \ redskin.tar.gz \ tiny_and_simple.tar.gz \ LCD.tar.gz @@ -33,7 +31,7 @@ NO_BUILD= yes DATA_DIRS= GNOME LCD Red_skin SimpleForDark e light_01 light_02 \ - miderat miderat_RTL tiny_and_simple tnf + tiny_and_simple tnf do-install: @${MKDIR} ${PREFIX}/share/gnome/gdeskcal diff -Nur gdeskcal-skins.orig/pkg-plist gdeskcal-skins/pkg-plist --- gdeskcal-skins.orig/pkg-plist Mon May 5 02:22:57 2003 +++ gdeskcal-skins/pkg-plist Fri Jun 27 14:55:15 2003 @@ -33,21 +33,6 @@ share/gnome/gdeskcal/skins/light_02/prev.png share/gnome/gdeskcal/skins/light_02/skin.xml share/gnome/gdeskcal/skins/light_02/skin.xml~ -share/gnome/gdeskcal/skins/miderat/bg.png -share/gnome/gdeskcal/skins/miderat/bg.xcf -share/gnome/gdeskcal/skins/miderat/home.png -share/gnome/gdeskcal/skins/miderat/next.png -share/gnome/gdeskcal/skins/miderat/prev.png -share/gnome/gdeskcal/skins/miderat/skin.xml -share/gnome/gdeskcal/skins/miderat/skin.xml~ -share/gnome/gdeskcal/skins/miderat/today.png -share/gnome/gdeskcal/skins/miderat_RTL/bg.png -share/gnome/gdeskcal/skins/miderat_RTL/bg.xcf -share/gnome/gdeskcal/skins/miderat_RTL/home.png -share/gnome/gdeskcal/skins/miderat_RTL/next.png -share/gnome/gdeskcal/skins/miderat_RTL/prev.png -share/gnome/gdeskcal/skins/miderat_RTL/skin.xml -share/gnome/gdeskcal/skins/miderat_RTL/today.png share/gnome/gdeskcal/skins/tiny_and_simple/skin.xml share/gnome/gdeskcal/skins/tnf/bg.png share/gnome/gdeskcal/skins/tnf/bg.xcf @@ -58,8 +43,6 @@ share/gnome/gdeskcal/skins/tnf/today.png @dirrm share/gnome/gdeskcal/skins/tnf @dirrm share/gnome/gdeskcal/skins/tiny_and_simple -@dirrm share/gnome/gdeskcal/skins/miderat_RTL -@dirrm share/gnome/gdeskcal/skins/miderat @dirrm share/gnome/gdeskcal/skins/light_02 @dirrm share/gnome/gdeskcal/skins/light_01 @dirrm share/gnome/gdeskcal/skins/e --- gdeskcal-skins.diff ends here ---