aboutsummaryrefslogtreecommitdiff
path: root/x11/xscreensaver/files
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2005-04-11 01:57:03 +0000
committerDoug Barton <dougb@FreeBSD.org>2005-04-11 01:57:03 +0000
commitbce8b334d98d914a360738cd5332f1f1b0840aba (patch)
treead4bad242d1e374f95aa034f7072b994cd6d0c12 /x11/xscreensaver/files
parentb15b8a0dc38c647919575ac60b41419f2c011dde (diff)
downloadports-bce8b334d98d914a360738cd5332f1f1b0840aba.tar.gz
ports-bce8b334d98d914a360738cd5332f1f1b0840aba.zip
Notes
Diffstat (limited to 'x11/xscreensaver/files')
-rw-r--r--x11/xscreensaver/files/patch-ab30
-rw-r--r--x11/xscreensaver/files/patch-driver_Makefile.in133
2 files changed, 23 insertions, 140 deletions
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index b2dc3fc43705..046d796521ad 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -9,33 +9,3 @@
OBJCC="$OBJCC -Wall"
# supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
# and then perhaps we can do without -pedantic?
-@@ -13491,7 +13491,7 @@
- ok="yes"
- pkg_check_version gtk+ 1.2 ; ac_gtk_version_string="$vers"
- pkg_check_version glib 1.0
-- pkg_check_version gdk_pixbuf 0.1
-+ # pkg_check_version gdk_pixbuf 0.1 - pick this up later
- have_gtk="$ok"
-
- # Now check for Gnome...
-@@ -19014,13 +19014,13 @@
- # Now that we know whether we have Gnome, we can decide where the XML
- # config files get installed.
- #
--if test -z "$HACK_CONF_DIR" ; then
-- if test -n "$GNOME_DATADIR" ; then
-- HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
-- else
-- HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
-- fi
--fi
-+#if test -z "$HACK_CONF_DIR" ; then
-+# if test -n "$GNOME_DATADIR" ; then
-+# HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
-+# else
-+# HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
-+# fi
-+#fi
-
-
-
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index c99156da81ae..87b817815f1e 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,7 +1,7 @@
---- driver/Makefile.in.orig Thu Feb 26 17:37:56 2004
-+++ driver/Makefile.in Sat Mar 6 23:51:07 2004
-@@ -125,7 +125,7 @@
- test-apm test-fade test-xinerama xdpyinfo
+--- driver/Makefile.in.orig Sun Mar 20 23:18:18 2005
++++ driver/Makefile.in Sun Apr 10 17:56:12 2005
+@@ -121,7 +121,7 @@
+ test-randr xdpyinfo
MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
-GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS)
@@ -9,120 +9,33 @@
XML_LIBS = @XML_LIBS@
XDPMS_LIBS = @XDPMS_LIBS@
-@@ -234,8 +234,6 @@
- EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
- xscreensaver-demo.glade xscreensaver-demo.glade2 \
- xscreensaver-demo.glade2p \
+@@ -234,7 +234,6 @@
+ EXTRAS = README Makefile.in \
+ XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
+ xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
- screensaver-properties.desktop.in \
-- screensaver-properties-capplet \
- xscreensaver.kss.in \
.gdbinit
VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \
-@@ -464,107 +462,6 @@
+ vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
+@@ -461,21 +460,6 @@
$$e "" ;\
fi ; \
fi
-
+-# screensaver-properties.desktop
+-# into /usr/share/applications/
-install-gnome:: screensaver-properties.desktop
-- @lost="" ;\
-- if [ "$(GNOME_DATADIR)" != "" ]; then \
-- \
-- if [ ! -d "$(install_prefix)$(GNOME_CCDIR_1)" ]; then \
-- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\
-- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\
-- fi ;\
-- if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then \
-- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\
-- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\
-- fi ;\
-- if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then \
-- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\
-- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\
-- fi ;\
-- if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then \
-- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\
-- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\
-- fi ;\
-- \
-- echo $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
-- \
-- if $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
-- then true ;\
-- else \
-- lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)" ;\
-- fi ;\
-- \
-- echo $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\
-- \
-- if $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\
-- then true ;\
-- else \
-- lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\
-- fi ;\
-- \
-- echo $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
-- \
-- if $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
-- then true ;\
-- else \
-- lost="$$lost $(install_prefix)$(GNOME_CCDIR_3)" ;\
-- fi ;\
-- \
-- echo $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop;\
-- if $(INSTALL_DATA) screensaver-properties.desktop \
-- $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop;\
-- then true ;\
-- else \
-- lost="$$lost $(install_prefix)$(GNOME_PANELDIR)" ;\
-- fi ;\
-- \
-- if [ "$$lost" != "" ]; then \
-- e=echo ; \
-- $$e "" ;\
-- $$e " ####################################################################";\
-- $$e " Warning: unable to install screensaver-properties.desktop into:" ;\
-- set - $$lost ;\
-- for f in $$@ ; do echo " $$f/" ; done ;\
-- $$e ' This means the "Screen Saver" section of the Gnome' ;\
-- $$e " Control Center (gnomecc) may not work properly." ;\
-- $$e " ####################################################################";\
-- $$e "" ;\
-- exit 1 ; \
-- fi ;\
-- fi
--
--install-gnome:: screensaver-properties-capplet
-- @if [ "$(GNOME_DATADIR)" != "" ]; then \
-- if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \
-- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\
-- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\
-- fi ;\
-- program=screensaver-properties-capplet ;\
-- echo $(INSTALL_SCRIPT) $(srcdir)/$$program \
-- $(install_prefix)$(GNOME_BINDIR)/$$program ;\
-- if $(INSTALL_SCRIPT) $(srcdir)/$$program \
-- $(install_prefix)$(GNOME_BINDIR)/$$program ;\
-- then true ;\
-- else \
-- e=echo ; \
-- $$e "" ;\
-- $$e " ####################################################################";\
-- $$e " Warning: unable to install $$program into" ;\
-- $$e " $(install_prefix)$(GNOME_BINDIR)/." ;\
-- $$e " Without this file, the Gnome session manager will not" ;\
-- $$e " launch xscreensaver properly at login time." ;\
-- $$e " ####################################################################";\
-- $$e "" ;\
-- exit 1 ; \
-- fi ; \
+- @if [ "$(GTK_DATADIR)" != "" ]; then \
+- if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
+- echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
+- $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
+- fi ;\
+- name2=gnome-screensaver-properties.desktop ;\
+- echo $(INSTALL_DATA) screensaver-properties.desktop \
+- $(install_prefix)$(GTK_APPDIR)/$$name2 ;\
+- $(INSTALL_DATA) screensaver-properties.desktop \
+- $(install_prefix)$(GTK_APPDIR)/$$name2 ;\
- fi
+
# xscreensaver.xpm
- # into /usr/share/pixmaps/
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 07:13:01 +0000