diff options
| author | dougb <dougb@FreeBSD.org> | 2002-06-05 16:51:01 +0800 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-06-05 16:51:01 +0800 |
| commit | 8301fb6dee6efac8625aa29e543aa55873db41c2 (patch) | |
| tree | c5367cc416a787b0eba8d97d1667f2da711e63bf /x11/xscreensaver/files | |
| parent | be114761dc3110b9f40244b691117a9f5bd2a9e8 (diff) | |
| download | freebsd-ports-gnome-8301fb6dee6efac8625aa29e543aa55873db41c2.tar.gz freebsd-ports-gnome-8301fb6dee6efac8625aa29e543aa55873db41c2.tar.zst freebsd-ports-gnome-8301fb6dee6efac8625aa29e543aa55873db41c2.zip | |
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
Diffstat (limited to 'x11/xscreensaver/files')
| -rw-r--r-- | x11/xscreensaver/files/patch-ab | 20 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-driver::Makefile.in | 11 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-driver_Makefile.in | 11 |
3 files changed, 14 insertions, 28 deletions
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab index 6ce706317db5..d75477c6e95c 100644 --- a/x11/xscreensaver/files/patch-ab +++ b/x11/xscreensaver/files/patch-ab @@ -1,6 +1,6 @@ ---- configure.orig Mon Mar 18 15:42:35 2002 -+++ configure Sat Mar 23 23:58:01 2002 -@@ -10728,13 +10728,13 @@ +--- configure.orig Fri May 31 20:43:47 2002 ++++ configure Wed Jun 5 00:58:27 2002 +@@ -17452,13 +17452,13 @@ # Now that we know whether we have Gnome, we can decide where the XML # config files get installed. # @@ -20,18 +20,4 @@ +#fi - -@@ -11658,8 +11658,12 @@ - # M4 sucks!! - --rpmv=`(rpm -qv xscreensaver) 2>&- | \ -+case `uname` in -+[Ll]inux) -+ rpmv=`(rpm -qv xscreensaver) 2>&- | \ - sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'` -+ ;; -+esac - - - if test \! -z "$rpmv" ; then diff --git a/x11/xscreensaver/files/patch-driver::Makefile.in b/x11/xscreensaver/files/patch-driver::Makefile.in deleted file mode 100644 index 3acb14502f32..000000000000 --- a/x11/xscreensaver/files/patch-driver::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- driver/Makefile.in.orig Mon Mar 18 15:42:36 2002 -+++ driver/Makefile.in Sun Mar 24 00:05:52 2002 -@@ -19,7 +19,7 @@ - GNOME_DATADIR = @GNOME_DATADIR@ - GNOME_CCDIR_1 = $(GNOME_DATADIR)/control-center/Desktop - GNOME_CCDIR_2 = $(GNOME_DATADIR)/control-center/capplets --GNOME_PANELDIR = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop -+GNOME_PANELDIR = $(GNOME_DATADIR)/apps/Settings/Desktop - GNOME_BINDIR = $(bindir) - HACK_CONF_DIR = @HACK_CONF_DIR@ - GTK_ICONDIR = @GTK_ICONDIR@ diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in new file mode 100644 index 000000000000..c7e40e2c7bdd --- /dev/null +++ b/x11/xscreensaver/files/patch-driver_Makefile.in @@ -0,0 +1,11 @@ +--- driver/Makefile.in.orig Fri May 31 20:43:49 2002 ++++ driver/Makefile.in Wed Jun 5 00:37:42 2002 +@@ -24,7 +24,7 @@ + + GNOME_DATADIR = @GNOME_DATADIR@ + GNOME_CCDIR = $(GNOME_DATADIR)/control-center/Desktop +-GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop ++GNOME_PANELDIR1 = $(GNOME_DATADIR)/apps/Settings/Desktop + GNOME_PANELDIR2 = $(GNOME_DATADIR)/applications + GNOME_PANELDIR = @GNOME_PANELDIR@ + GLADE_DATADIR = @GLADE_DATADIR@ |