Update to 4.06, mostly a bug fix release.
Add support for a gtk2 flavor.
This commit is contained in:
marcm
parent
10d36668fa
commit
5eb6d74abc
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2002/09/19 06:42:00 marcm Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2003/02/18 19:10:33 marcm Exp $
|
||||
|
||||
COMMENT= "screen saver and locker for the X Window System"
|
||||
|
||||
VERSION= 4.05
|
||||
VERSION= 4.06
|
||||
DISTNAME= xscreensaver-${VERSION}
|
||||
PKGNAME= xscreensaver-${VERSION}p1
|
||||
CATEGORIES= x11
|
||||
|
||||
HOMEPAGE= http://www.jwz.org/xscreensaver/
|
||||
@ -20,8 +19,7 @@ MASTER_SITES= http://www.jwz.org/xscreensaver/
|
||||
|
||||
MODULES= gettext
|
||||
|
||||
LIB_DEPENDS+= xml2.6::textproc/libxml \
|
||||
gdk_pixbuf.2,gdk_pixbuf_xlib.2::graphics/gdk-pixbuf
|
||||
LIB_DEPENDS+= xml2.6::textproc/libxml
|
||||
|
||||
MAKE_ENV+= ${CONFIGURE_ENV}
|
||||
|
||||
@ -40,9 +38,9 @@ CONFIGURE_ARGS+= --without-kerberos
|
||||
CONFIGURE_ARGS+= --with-xml
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -pthread"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
FLAVORS= no_gle
|
||||
FLAVORS= no_gle gtk2
|
||||
FLAVOR?=
|
||||
|
||||
.if !${FLAVOR:L:Mno_gle}
|
||||
@ -52,6 +50,14 @@ CONFIGURE_ARGS+= --with-gle
|
||||
CONFIGURE_ARGS+= --without-gle
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mgtk2}
|
||||
LIB_DEPENDS+= gdk_pixbuf_xlib-2.0.0.0::x11/gtk+2 \
|
||||
glade-2.0.0.0::devel/libglade2
|
||||
CONFIGURE_ARGS+= --with-gtk2
|
||||
.else
|
||||
LIB_DEPENDS+= gdk_pixbuf.2,gdk_pixbuf_xlib.2::graphics/gdk-pixbuf
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
# rename deco to xdeco, so it doesn't conflict with misc/deco
|
||||
@mv ${PREFIX}/man/man1/deco.1 ${PREFIX}/man/man1/xdeco.1
|
||||
@ -59,5 +65,9 @@ post-install:
|
||||
${PREFIX}/libexec/xscreensaver/xdeco
|
||||
@mv ${PREFIX}/lib/xscreensaver/config/deco.xml \
|
||||
${PREFIX}/lib/xscreensaver/config/xdeco.xml
|
||||
# Need a pretty icon for the controlcenter
|
||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
|
||||
@${INSTALL_DATA} ${PREFIX}/share/xscreensaver/xscreensaver.xpm \
|
||||
${PREFIX}/share/pixmaps/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (xscreensaver-4.05.tar.gz) = 39b05d4da14158638e501e3bc31c0943
|
||||
RMD160 (xscreensaver-4.05.tar.gz) = c3fb3c69f2e9958877b92f9dd365ceed9e2668c2
|
||||
SHA1 (xscreensaver-4.05.tar.gz) = 90a29ee99c7b36baf01aa152f2ab2ac9392cb3f1
|
||||
MD5 (xscreensaver-4.06.tar.gz) = acf78cc3ce7c8145dea79e9aa610c86d
|
||||
RMD160 (xscreensaver-4.06.tar.gz) = 5fc2139791b506a788689d8730175dce6dd89973
|
||||
SHA1 (xscreensaver-4.06.tar.gz) = ba2c14d632ee5d876e1d2b580e6aa6d67b813119
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2002/08/27 02:46:17 lebel Exp $
|
||||
--- configure.in.orig Tue Jun 11 02:02:00 2002
|
||||
+++ configure.in Tue Aug 20 20:34:13 2002
|
||||
@@ -1823,6 +1823,10 @@ AC_ARG_WITH(gtk,
|
||||
$OpenBSD: patch-configure_in,v 1.2 2003/02/18 19:10:33 marcm Exp $
|
||||
--- configure.in.orig Wed Oct 23 05:24:25 2002
|
||||
+++ configure.in Mon Jan 20 20:14:39 2003
|
||||
@@ -1821,6 +1821,10 @@ AC_ARG_WITH(gtk,
|
||||
[ --with-gtk Use the Gtk toolkit for the user interface.],
|
||||
[with_gtk="$withval"; with_gtk_req="$withval"],[with_gtk=yes])
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-configure_in,v 1.1 2002/08/27 02:46:17 lebel Exp $
|
||||
# if --with-gtk=/directory/ was specified, remember that directory so that
|
||||
# we can also look for the `gtk-config' program in that directory.
|
||||
case "$with_gtk" in
|
||||
@@ -1904,7 +1908,12 @@ if test "$with_gtk" = yes; then
|
||||
@@ -1902,7 +1906,12 @@ if test "$with_gtk" = yes; then
|
||||
gtk_path="$foo:$gtk_path"
|
||||
fi
|
||||
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-configure_in,v 1.1 2002/08/27 02:46:17 lebel Exp $
|
||||
|
||||
if test -n "$pkg_config" ; then
|
||||
#
|
||||
@@ -1953,7 +1962,10 @@ if test "$with_gtk" = yes; then
|
||||
@@ -1952,7 +1961,10 @@ if test "$with_gtk" = yes; then
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -38,3 +38,57 @@ $OpenBSD: patch-configure_in,v 1.1 2002/08/27 02:46:17 lebel Exp $
|
||||
#
|
||||
# we don't have GTK 2. Let's look for GTK 1.
|
||||
#
|
||||
@@ -2098,7 +2110,7 @@ if test "$with_gtk" = yes; then
|
||||
|
||||
fi # end of {gnome,gtk}-config based tests
|
||||
|
||||
- if test "$have_gtk" = yes -a "$have_gtk2" = no; then
|
||||
+ if test "$have_gnome" = yes -a "$have_gtk2" = no; then
|
||||
# check for this function that was not in libcapplet 1.2.
|
||||
# (only needed in Gnome/Gtk 1.x, not Gnome/Gtk 2.x)
|
||||
AC_CHECK_X_LIB(capplet, capplet_widget_changes_are_immediate,
|
||||
@@ -2113,7 +2125,7 @@ if test "$with_gtk" = yes; then
|
||||
if test "$have_gtk2" = yes; then
|
||||
GNOME_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
|
||||
else
|
||||
- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+`
|
||||
+ GNOME_DATADIR=`$gtk_config --prefix`
|
||||
fi
|
||||
else
|
||||
GNOME_DATADIR=`$gtk_config --prefix`
|
||||
@@ -2511,7 +2523,7 @@ if test "$with_gl" = yes; then
|
||||
# link -lpthread after the Mesa libs (be they named -lGL or -lMesaGL.)
|
||||
#
|
||||
if test "$ac_have_mesa_gl" = yes; then
|
||||
- AC_CHECK_LIB(pthread, pthread_create, [GL_LIBS="-lpthread"], [],)
|
||||
+ AC_CHECK_LIB(pthread, pthread_create, [GL_LIBS="-pthread"], [],)
|
||||
fi
|
||||
|
||||
|
||||
@@ -3326,7 +3338,7 @@ fi
|
||||
# config files get installed.
|
||||
#
|
||||
if test -z "$HACK_CONF_DIR" ; then
|
||||
- if test -n "$GNOME_DATADIR" ; then
|
||||
+ if test "x$with_gnome" == "xyes"; then
|
||||
HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
|
||||
else
|
||||
HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
|
||||
@@ -3350,7 +3362,7 @@ elif test "$have_gtk" = yes; then
|
||||
if test "$have_gtk2" = yes; then
|
||||
GLADE_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
|
||||
else
|
||||
- GLADE_DATADIR=`$pkg_config --variable=prefix gtk+`
|
||||
+ GLADE_DATADIR=`$gtk_config --prefix`
|
||||
fi
|
||||
else
|
||||
GLADE_DATADIR=`$gtk_config --prefix`
|
||||
@@ -3371,7 +3383,7 @@ elif test "$have_gtk" = yes; then
|
||||
if test "$have_gtk2" = yes; then
|
||||
PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
|
||||
else
|
||||
- PO_DATADIR=`$pkg_config --variable=prefix gtk+`
|
||||
+ PO_DATADIR=`$gtk_config --prefix`
|
||||
fi
|
||||
else
|
||||
PO_DATADIR=`$gtk_config --prefix`
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-driver_XScreenSaver_ad_in,v 1.1 2002/03/27 01:28:58 lebel Exp $
|
||||
--- driver/XScreenSaver.ad.in.orig Tue Mar 26 20:10:42 2002
|
||||
+++ driver/XScreenSaver.ad.in Tue Mar 26 20:11:02 2002
|
||||
@@ -181,7 +181,7 @@
|
||||
$OpenBSD: patch-driver_XScreenSaver_ad_in,v 1.2 2003/02/18 19:10:33 marcm Exp $
|
||||
--- driver/XScreenSaver.ad.in.orig Wed Oct 23 18:34:46 2002
|
||||
+++ driver/XScreenSaver.ad.in Mon Jan 20 15:40:07 2003
|
||||
@@ -183,7 +183,7 @@
|
||||
noseguy -root \n\
|
||||
flame -root \n\
|
||||
lmorph -root \n\
|
||||
|
||||
@ -1,15 +1,9 @@
|
||||
$OpenBSD: patch-driver_screensaver-properties_desktop_in,v 1.1 2002/08/27 02:46:17 lebel Exp $
|
||||
--- driver/screensaver-properties.desktop.in.orig Wed Aug 21 00:18:24 2002
|
||||
+++ driver/screensaver-properties.desktop.in Wed Aug 21 00:23:01 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
[Desktop Entry]
|
||||
-Exec=xscreensaver-demo --crapplet
|
||||
+Exec=xscreensaver-demo
|
||||
TryExec=xscreensaver-demo
|
||||
Icon=xscreensaver.xpm
|
||||
Terminal=0
|
||||
$OpenBSD: patch-driver_screensaver-properties_desktop_in,v 1.2 2003/02/18 19:10:33 marcm Exp $
|
||||
--- driver/screensaver-properties.desktop.in.orig Sat Jan 25 20:02:45 2003
|
||||
+++ driver/screensaver-properties.desktop.in Sat Jan 25 20:02:48 2003
|
||||
@@ -6,4 +6,4 @@ Terminal=0
|
||||
_Name=Screensaver
|
||||
_Comment=Configure the settings of the screensaver.
|
||||
_Comment=Change screensaver properties
|
||||
Type=Application
|
||||
-Categories=Applications;Settings;
|
||||
+Categories=Application;System;
|
||||
+Categories=Application;Settings;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-driver_xscreensaver_man,v 1.2 2002/06/26 02:36:04 lebel Exp $
|
||||
--- driver/xscreensaver.man.orig Tue Jun 11 05:09:05 2002
|
||||
+++ driver/xscreensaver.man Tue Jun 25 21:21:50 2002
|
||||
@@ -1311,7 +1311,7 @@ and a FAQ can always be found at http://
|
||||
$OpenBSD: patch-driver_xscreensaver_man,v 1.3 2003/02/18 19:10:33 marcm Exp $
|
||||
--- driver/xscreensaver.man.orig Wed Oct 23 18:34:46 2002
|
||||
+++ driver/xscreensaver.man Mon Jan 20 15:40:07 2003
|
||||
@@ -1320,7 +1320,7 @@ and a FAQ can always be found at http://
|
||||
.BR crystal (1),
|
||||
.BR cynosure (1),
|
||||
.BR decayscreen (1),
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2002/06/26 02:36:04 lebel Exp $
|
||||
--- po/Makefile.in.in.orig Thu Jun 6 02:00:38 2002
|
||||
+++ po/Makefile.in.in Tue Jun 25 21:38:18 2002
|
||||
$OpenBSD: patch-po_Makefile_in_in,v 1.2 2003/02/18 19:10:33 marcm Exp $
|
||||
--- po/Makefile.in.in.orig Mon Jan 20 17:45:10 2003
|
||||
+++ po/Makefile.in.in Mon Jan 20 17:45:13 2003
|
||||
@@ -100,7 +100,7 @@ VPATH = @srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
#datadir = $(prefix)/@DATADIRNAME@ -- not for xscreensaver
|
||||
-datadir = @GNOME_DATADIR@
|
||||
+datadir = $(DESTDIR)$(prefix)/share
|
||||
-datadir = @PO_DATADIR@
|
||||
+datadir = $(DESTDIR)@PO_DATADIR@
|
||||
localedir = $(datadir)/locale
|
||||
#gnulocaledir = $(prefix)/share/locale -- not for xscreensaver
|
||||
gnulocaledir = $(localedir)
|
||||
|
||||
4
x11/xscreensaver/pkg/PFRAG.gtk2
Normal file
4
x11/xscreensaver/pkg/PFRAG.gtk2
Normal file
@ -0,0 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.gtk2,v 1.1 2003/02/18 19:10:33 marcm Exp $
|
||||
share/control-center-2.0/capplets/screensaver-properties.desktop
|
||||
@comment @dirrm share/control-center-2.0/capplets
|
||||
@comment @dirrm share/control-center-2.0
|
||||
@ -1,5 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.9 2002/08/27 02:46:17 lebel Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.10 2003/02/18 19:10:33 marcm Exp $
|
||||
!%%no_gle%%
|
||||
%%gtk2%%
|
||||
@comment bin/screensaver-properties-capplet
|
||||
bin/xscreensaver
|
||||
bin/xscreensaver-command
|
||||
bin/xscreensaver-demo
|
||||
@ -54,6 +56,7 @@ lib/xscreensaver/config/forest.xml
|
||||
lib/xscreensaver/config/galaxy.xml
|
||||
lib/xscreensaver/config/gears.xml
|
||||
lib/xscreensaver/config/gflux.xml
|
||||
lib/xscreensaver/config/glblur.xml
|
||||
lib/xscreensaver/config/glforestfire.xml
|
||||
lib/xscreensaver/config/glplanet.xml
|
||||
lib/xscreensaver/config/glsnake.xml
|
||||
@ -62,6 +65,7 @@ lib/xscreensaver/config/goban.xml
|
||||
lib/xscreensaver/config/goop.xml
|
||||
lib/xscreensaver/config/grav.xml
|
||||
lib/xscreensaver/config/greynetic.xml
|
||||
lib/xscreensaver/config/halftone.xml
|
||||
lib/xscreensaver/config/halo.xml
|
||||
lib/xscreensaver/config/helix.xml
|
||||
lib/xscreensaver/config/hopalong.xml
|
||||
@ -207,6 +211,7 @@ libexec/xscreensaver/forest
|
||||
libexec/xscreensaver/galaxy
|
||||
libexec/xscreensaver/gears
|
||||
libexec/xscreensaver/gflux
|
||||
libexec/xscreensaver/glblur
|
||||
libexec/xscreensaver/glforestfire
|
||||
libexec/xscreensaver/glplanet
|
||||
libexec/xscreensaver/glsnake
|
||||
@ -214,6 +219,7 @@ libexec/xscreensaver/gltext
|
||||
libexec/xscreensaver/goop
|
||||
libexec/xscreensaver/grav
|
||||
libexec/xscreensaver/greynetic
|
||||
libexec/xscreensaver/halftone
|
||||
libexec/xscreensaver/halo
|
||||
libexec/xscreensaver/helix
|
||||
libexec/xscreensaver/hopalong
|
||||
@ -353,6 +359,7 @@ man/man1/forest.1
|
||||
man/man1/galaxy.1
|
||||
man/man1/gears.1
|
||||
man/man1/gflux.1
|
||||
man/man1/glblur.1
|
||||
man/man1/glforestfire.1
|
||||
man/man1/glplanet.1
|
||||
man/man1/glsnake.1
|
||||
@ -360,6 +367,7 @@ man/man1/gltext.1
|
||||
man/man1/goop.1
|
||||
man/man1/grav.1
|
||||
man/man1/greynetic.1
|
||||
man/man1/halftone.1
|
||||
man/man1/halo.1
|
||||
man/man1/helix.1
|
||||
man/man1/hopalong.1
|
||||
@ -461,6 +469,10 @@ man/man1/xspirograph.1
|
||||
man/man1/xsublim.1
|
||||
man/man1/xteevee.1
|
||||
man/man1/zoom.1
|
||||
@comment share/applications/screensaver-properties.desktop
|
||||
share/control-center/Desktop/screensaver-properties.desktop
|
||||
@comment share/control-center/capplets/screensaver-properties.desktop
|
||||
@comment share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
|
||||
share/locale/ca/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/da/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/de/LC_MESSAGES/xscreensaver.mo
|
||||
@ -472,12 +484,18 @@ 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/nl/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/ru/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/sk/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/sv/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/vi/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/wa/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
|
||||
share/pixmaps/xscreensaver.xpm
|
||||
share/xscreensaver/screensaver-cmndln.xpm
|
||||
share/xscreensaver/screensaver-colorselector.xpm
|
||||
share/xscreensaver/screensaver-diagnostic.xpm
|
||||
@ -487,6 +505,60 @@ share/xscreensaver/screensaver-snap.xpm
|
||||
share/xscreensaver/xscreensaver-demo.glade2
|
||||
share/xscreensaver/xscreensaver.xpm
|
||||
@dirrm share/xscreensaver
|
||||
@comment @dirrm share/pixmaps
|
||||
@comment @dirrm share/locale/zh_TW/LC_MESSAGES
|
||||
@comment @dirrm share/locale/zh_TW
|
||||
@comment @dirrm share/locale/zh_CN/LC_MESSAGES
|
||||
@comment @dirrm share/locale/zh_CN
|
||||
@comment @dirrm share/locale/wa/LC_MESSAGES
|
||||
@comment @dirrm share/locale/wa
|
||||
@comment @dirrm share/locale/vi/LC_MESSAGES
|
||||
@comment @dirrm share/locale/vi
|
||||
@comment @dirrm share/locale/sv/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sv
|
||||
@comment @dirrm share/locale/sk/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sk
|
||||
@comment @dirrm share/locale/ru/LC_MESSAGES
|
||||
@comment @dirrm share/locale/ru
|
||||
@comment @dirrm share/locale/pt/LC_MESSAGES
|
||||
@comment @dirrm share/locale/pt
|
||||
@comment @dirrm share/locale/pl/LC_MESSAGES
|
||||
@comment @dirrm share/locale/pl
|
||||
@comment @dirrm share/locale/no/LC_MESSAGES
|
||||
@comment @dirrm share/locale/no
|
||||
@comment @dirrm share/locale/nl/LC_MESSAGES
|
||||
@comment @dirrm share/locale/nl
|
||||
@comment @dirrm share/locale/ko/LC_MESSAGES
|
||||
@comment @dirrm share/locale/ko
|
||||
@comment @dirrm share/locale/ja/LC_MESSAGES
|
||||
@comment @dirrm share/locale/ja
|
||||
@comment @dirrm share/locale/it/LC_MESSAGES
|
||||
@comment @dirrm share/locale/it
|
||||
@comment @dirrm share/locale/hu/LC_MESSAGES
|
||||
@comment @dirrm share/locale/hu
|
||||
@comment @dirrm share/locale/fr/LC_MESSAGES
|
||||
@comment @dirrm share/locale/fr
|
||||
@comment @dirrm share/locale/fi/LC_MESSAGES
|
||||
@comment @dirrm share/locale/fi
|
||||
@comment @dirrm share/locale/et/LC_MESSAGES
|
||||
@comment @dirrm share/locale/et
|
||||
@comment @dirrm share/locale/es/LC_MESSAGES
|
||||
@comment @dirrm share/locale/es
|
||||
@comment @dirrm share/locale/de/LC_MESSAGES
|
||||
@comment @dirrm share/locale/de
|
||||
@comment @dirrm share/locale/da/LC_MESSAGES
|
||||
@comment @dirrm share/locale/da
|
||||
@comment @dirrm share/locale/ca/LC_MESSAGES
|
||||
@comment @dirrm share/locale/ca
|
||||
@comment @dirrm share/locale
|
||||
@comment @dirrm share/gnome/apps/Settings/Desktop
|
||||
@comment @dirrm share/gnome/apps/Settings
|
||||
@comment @dirrm share/gnome/apps
|
||||
@comment @dirrm share/gnome
|
||||
@comment @dirrm share/control-center/capplets
|
||||
@comment @dirrm share/control-center/Desktop
|
||||
@comment @dirrm share/control-center
|
||||
@comment @dirrm share/applications
|
||||
@dirrm libexec/xscreensaver
|
||||
@dirrm lib/xscreensaver/config
|
||||
@dirrm lib/xscreensaver
|
||||
|
||||
Loading…
Reference in New Issue
Block a user