From owner-cvs-all Thu Jun 6 13: 1:17 2002 Delivered-To: cvs-all@freebsd.org Received: from sdns.kv.ukrtel.net (sdns.kv.ukrtel.net [195.5.27.246]) by hub.freebsd.org (Postfix) with ESMTP id A045137B401; Thu, 6 Jun 2002 13:00:42 -0700 (PDT) Received: from vega.vega.com (195.5.51.243 [195.5.51.243]) by sdns.kv.ukrtel.net with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2650.21) id M2L7DML4; Thu, 6 Jun 2002 23:02:39 +0300 Received: from FreeBSD.org (big_brother.vega.com [192.168.1.1]) by vega.vega.com (8.11.6/8.11.3) with ESMTP id g56K0f319079; Thu, 6 Jun 2002 23:00:41 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) Message-ID: <3CFFBF8D.91617488@FreeBSD.org> Date: Thu, 06 Jun 2002 23:01:17 +0300 From: Maxim Sobolev Organization: Vega International Capital X-Mailer: Mozilla 4.79 [en] (Windows NT 5.0; U) X-Accept-Language: en,uk,ru MIME-Version: 1.0 To: Doug Barton , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/x11/xscreensaver Makefile distinfo pkg-plistports/x11/xscreensaver/files patch-ab patch-driver::Makefile.inpatch-driver_Makefile.in References: <200206050851.g558p1E15634@freefall.freebsd.org> <3CFFBCB2.3BB33A6A@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------14671A9630033E74E6745663" Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This is a multi-part message in MIME format. --------------14671A9630033E74E6745663 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Maxim Sobolev wrote: > > Please put PLIST_SUB for nognome case back, because otherwise PLIST is > broken. Attached is the patch which fixes this problem and another problem with PLIST (webcollage-helper) as well as fixes libintl detection and enables localisation of the frontend. Please either commit this patch or allow me commit it. -Maxim > > -Maxim > > Doug Barton wrote: > > > > dougb 2002/06/05 01:51:01 PDT > > > > Modified files: > > x11/xscreensaver Makefile distinfo pkg-plist > > x11/xscreensaver/files patch-ab > > Added files: > > x11/xscreensaver/files patch-driver_Makefile.in > > Removed files: > > x11/xscreensaver/files patch-driver::Makefile.in > > Log: > > Upgrade to version 4.04.2, and clean up the port while I'm at it. > > > > Changes to the software: > > * Several new little screensavers (hacks) > > * Updates to many others > > * Better GTK/Gnome 2 support > > * New man pages for things that didn't have them > > > > Changes to the port: > > * Removed ill-advised, unapproved, and inappropriate changes > > from previous commits. Things like webcollage-helper are created > > dynamically by configure, and will be accounted for at some point > > in the future. Meanwhile, having one extra item for a few people > > is better than one two few for others. > > * One more port goes over to the GMAKE darkside > > * Since there are so many new man pages, re-sort them all > > * Updated pkg-plist for the new stuff > > * One of my patches was included in the distribution, so > > shorten patch-ab > > * Take advantage of the fact that I have to regenerate the > > other patch anyway, and fix the name of the patch file > > > > Revision Changes Path > > 1.54 +36 -22 ports/x11/xscreensaver/Makefile > > 1.28 +1 -1 ports/x11/xscreensaver/distinfo > > 1.14 +3 -17 ports/x11/xscreensaver/files/patch-ab > > 1.5 +0 -11 ports/x11/xscreensaver/files/patch-driver::Makefile.in (dead) > > 1.1 +11 -0 ports/x11/xscreensaver/files/patch-driver_Makefile.in (new) > > 1.33 +9 -1 ports/x11/xscreensaver/pkg-plist --------------14671A9630033E74E6745663 Content-Type: text/plain; charset=koi8-r; name="xscreensaver.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xscreensaver.diff" ? pkg-plist,v Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver/Makefile,v retrieving revision 1.54 diff -d -u -r1.54 Makefile --- Makefile 5 Jun 2002 08:51:00 -0000 1.54 +++ Makefile 6 Jun 2002 19:58:06 -0000 @@ -34,6 +34,8 @@ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ --with-jpeg=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include @@ -42,9 +44,10 @@ CONFIGURE_ARGS+= --with-gnome .else CONFIGURE_ARGS+= --without-gnome +PLIST_SUB+= GNOME:="@comment " .endif -CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml +CONFIGURE_ENV+= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \ blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver/pkg-plist,v retrieving revision 1.33 diff -d -u -r1.33 pkg-plist --- pkg-plist 5 Jun 2002 08:51:00 -0000 1.33 +++ pkg-plist 6 Jun 2002 19:58:06 -0000 @@ -139,6 +139,7 @@ bin/xscreensaver-hacks/vines bin/xscreensaver-hacks/wander bin/xscreensaver-hacks/webcollage +bin/xscreensaver-hacks/webcollage-helper bin/xscreensaver-hacks/whirlwindwarp bin/xscreensaver-hacks/whirlygig bin/xscreensaver-hacks/worm @@ -162,6 +163,24 @@ %%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm %%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm %%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm +share/locale/ca/LC_MESSAGES/xscreensaver.mo +share/locale/da/LC_MESSAGES/xscreensaver.mo +share/locale/de/LC_MESSAGES/xscreensaver.mo +share/locale/es/LC_MESSAGES/xscreensaver.mo +share/locale/et/LC_MESSAGES/xscreensaver.mo +share/locale/fi/LC_MESSAGES/xscreensaver.mo +share/locale/fr/LC_MESSAGES/xscreensaver.mo +share/locale/hu/LC_MESSAGES/xscreensaver.mo +share/locale/it/LC_MESSAGES/xscreensaver.mo +share/locale/ja/LC_MESSAGES/xscreensaver.mo +share/locale/ko/LC_MESSAGES/xscreensaver.mo +share/locale/no/LC_MESSAGES/xscreensaver.mo +share/locale/pl/LC_MESSAGES/xscreensaver.mo +share/locale/pt/LC_MESSAGES/xscreensaver.mo +share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo +share/locale/ru/LC_MESSAGES/xscreensaver.mo +share/locale/sv/LC_MESSAGES/xscreensaver.mo +share/locale/wa/LC_MESSAGES/xscreensaver.mo share/xscreensaver/config/README share/xscreensaver/config/anemone.xml share/xscreensaver/config/ant.xml Index: files/patch-po::Makefile.in.in =================================================================== RCS file: files/patch-po::Makefile.in.in diff -N files/patch-po::Makefile.in.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-po::Makefile.in.in 6 Jun 2002 19:58:06 -0000 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2002/06/06 19:53:47 1.1 ++++ po/Makefile.in.in 2002/06/06 19:54:28 +@@ -101,7 +101,7 @@ + exec_prefix = @exec_prefix@ + #datadir = $(prefix)/@DATADIRNAME@ -- not for xscreensaver + datadir = @GNOME_DATADIR@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + #gnulocaledir = $(prefix)/share/locale -- not for xscreensaver + gnulocaledir = $(localedir) + #gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po Index: files/patch-po::es.po =================================================================== RCS file: files/patch-po::es.po diff -N files/patch-po::es.po --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-po::es.po 6 Jun 2002 19:58:06 -0000 @@ -0,0 +1,16 @@ + +$FreeBSD$ + +--- po/es.po 2002/06/06 19:49:40 1.1 ++++ po/es.po 2002/06/06 19:50:07 +@@ -6686,10 +6686,6 @@ + #~ msgid "If the solver can " + #~ msgstr "Si el resolutor puede " + +-#: driver/screensaver-properties.desktop.in:3 +-msgid "Screensaver" +-msgstr "Propiedades Salvapantallas" +- + #: driver/screensaver-properties.desktop.in:4 + msgid "Configure the settings of the screensaver." + msgstr "Configurar el salvapantalla" --------------14671A9630033E74E6745663-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message