diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-02 07:45:44 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-02 07:45:44 +0000 |
| commit | 5820a0a6c4ec5b167e67fb8231efed554e1a0233 (patch) | |
| tree | 5a7d2d0bd5a394fcc29701a64c1896e4b18fe142 /x11/xscreensaver-gnome/files | |
| parent | 98083f88a87ae2afe05d52b0ea58c098ecce37b2 (diff) | |
| download | ports-5820a0a6c4ec5b167e67fb8231efed554e1a0233.tar.gz ports-5820a0a6c4ec5b167e67fb8231efed554e1a0233.zip | |
* Update to 4.10 [1]
* Convert to a GTK+-2 port [2]
Obtained from: x11/xscreensaver [1]
Submitted by: Alexander Nedotsukov <bland@mail.ru> [2]
Notes
Notes:
svn path=/head/; revision=81975
Diffstat (limited to 'x11/xscreensaver-gnome/files')
3 files changed, 8 insertions, 36 deletions
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab index 6c67406a6e40..1eab7a77fdeb 100644 --- a/x11/xscreensaver-gnome/files/patch-ab +++ b/x11/xscreensaver-gnome/files/patch-ab @@ -3,24 +3,6 @@ $FreeBSD$ --- configure.orig Tue Jun 11 12:09:04 2002 +++ configure Thu Jul 18 15:09:54 2002 -@@ -12483,7 +12483,7 @@ - pkg_check_version gmodule-2.0 2.0.0 - pkg_check_version libxml-2.0 2.4.6 - pkg_check_version libglade-2.0 1.99.0 -- have_gtk="$ok" -+ have_gtk="no" - - if test "$have_gtk" = yes; then - have_gtk2=yes -@@ -13116,7 +13116,7 @@ - - # First check for XML 2.x. - # -- pkg_check_version libxml-2.0 2.4.6 -+ pkg_check_version libxml 1.0 - - # If that didn't work (we don't have XML 2.x) and we *don't* have - # Gtk 2.x, then check to see if we have XML 1.x @@ -17491,13 +17491,13 @@ # Now that we know whether we have Gnome, we can decide where the XML # config files get installed. diff --git a/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in b/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in deleted file mode 100644 index aa2bbc2ec14c..000000000000 --- a/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- driver/screensaver-properties.desktop.in 2002/08/06 08:25:53 1.1 -+++ driver/screensaver-properties.desktop.in 2002/08/06 08:26:01 -@@ -1,5 +1,5 @@ - [Desktop Entry] --Exec=xscreensaver-demo --crapplet -+Exec=xscreensaver-demo - TryExec=xscreensaver-demo - Icon=xscreensaver.xpm - Terminal=0 diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in index b66a4a20c0bb..f109e7d16612 100644 --- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in +++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in @@ -1,20 +1,22 @@ ---- driver/Makefile.in.orig Wed Oct 23 23:26:18 2002 -+++ driver/Makefile.in Sun Nov 10 01:07:33 2002 -@@ -23,11 +23,11 @@ +--- driver/Makefile.in.orig Tue Mar 18 07:30:00 2003 ++++ driver/Makefile.in Mon May 19 22:01:49 2003 +@@ -24,11 +24,11 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ GNOME_DATADIR = @GNOME_DATADIR@ -GNOME_CCDIR_1 = $(GNOME_DATADIR)/control-center/Desktop +-GNOME_CCDIR_2 = $(GNOME_DATADIR)/control-center/capplets +-GNOME_CCDIR_3 = $(GNOME_DATADIR)/control-center-2.0/capplets +GNOME_CCDIR_1 = $(GNOME_DATADIR)/gnome/control-center/Desktop - GNOME_CCDIR_2 = $(GNOME_DATADIR)/control-center/capplets - GNOME_CCDIR_3 = $(GNOME_DATADIR)/control-center-2.0/capplets ++GNOME_CCDIR_2 = $(GNOME_DATADIR)/gnome/control-center/capplets ++GNOME_CCDIR_3 = $(GNOME_DATADIR)/gnome/control-center-2.0/capplets GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop -GNOME_PANELDIR2 = $(GNOME_DATADIR)/applications +GNOME_PANELDIR2 = $(GNOME_DATADIR)/gnome/applications GNOME_PANELDIR = @GNOME_PANELDIR@ GLADE_DATADIR = @GLADE_DATADIR@ GNOME_BINDIR = $(bindir) -@@ -475,8 +475,11 @@ +@@ -477,8 +477,11 @@ \ echo $(INSTALL_DATA) screensaver-properties.desktop \ $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\ |