1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

* Assume maintainership. Mail to jseger went unanswered, and this port

has been periodically maintained by others for 9 months in any case.
* Upgrade 3.26 -> 3.29
* Specify full path to fortune, since many of the screen saver programs
  could not find it on their own.
* Fix the -lpthread -> -pthread problem.
* Re-generate patch files.
* Eliminate patch-ae, whose only purpose in life was to prevent the
  building and installation of the xscreensaver-demo program which, in
  addition to being the method used to configure the server and
  all the little screensaver programs; works just fine, and doesn't
  actually hurt anything.

The report in the PR is a little out of date with reference to the latest
xscreensaver version, but all parts of the thing are working for me now
in any case.

PR:		ports/23619
Submitted by:	Lars Eggert <larse@isi.edu>
This commit is contained in:
Doug Barton 2001-03-03 01:49:13 +00:00
parent d41accf670
commit d33199033b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39001
7 changed files with 34 additions and 60 deletions

View File

@ -6,20 +6,21 @@
#
PORTNAME= xscreensaver
PORTVERSION= 3.26
PORTVERSION= 3.29
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
MAINTAINER= jseger@FreeBSD.org
MAINTAINER= DougB@FreeBSD.org
USE_X_PREFIX= yes
USE_XPM= yes
USE_MESA= yes
WANT_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --without-gnome
CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --without-gnome \
--with-zippy=/usr/games/fortune
MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \
MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \
bsod.1 bubbles.1 critical.1 decayscreen.1 \
deco.1 distort.1 drift.1 epicycle.1 flag.1 flame.1 \
forest.1 galaxy.1 gflux.1 goop.1 grav.1 greynetic.1 \
@ -30,10 +31,15 @@ MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \
rd-bomb.1 rocks.1 rorschach.1 sierpinski.1 slidescreen.1 \
slip.1 sonar.1 sphere.1 spiral.1 spotlight.1 squiral.1 \
starfish.1 strange.1 swirl.1 t3d.1 vidwhacker.1 vines.1 \
webcollage.1 xflame.1 xjack.1 xlyap.1 xmatrix.1 xroger.1 \
webcollage.1 xflame.1 xjack.1 xlyap.1 xmatrix.1 \
xscreensaver-command.1 xscreensaver-gl-helper.1 \
xscreensaver.1 xsublim.1 xteevee.1
post-patch:
@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
@ ${SED} -e 's#-lpthread#-pthread#g' \
${WRKSRC}/configure.Patched > ${WRKSRC}/configure
.include <bsd.port.pre.mk>
.if defined(HAVE_GTK)

View File

@ -1 +1 @@
MD5 (xscreensaver-3.26.tar.gz) = 81afd1e8510024f8feb8ddd335d63c06
MD5 (xscreensaver-3.29.tar.gz) = 4fb0144f56f4e595eaf1aae8d139dbca

View File

@ -1,6 +1,6 @@
--- configure.orig Sat Nov 11 10:43:52 2000
+++ configure Sun Nov 12 11:14:09 2000
@@ -3174,7 +3174,7 @@
--- configure.orig Tue Feb 13 00:09:23 2001
+++ configure Mon Feb 26 01:54:03 2001
@@ -3239,7 +3239,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@ -9,7 +9,7 @@
else
echo "$ac_t""no" 1>&6
fi
@@ -5336,7 +5336,7 @@
@@ -5401,7 +5401,7 @@
PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
elif test "$have_kerberos" = yes ; then
# from Tim Showalter <tjs+@andrew.cmu.edu>

View File

@ -1,8 +1,8 @@
--- hacks/webcollage.orig Thu Sep 9 20:45:45 1999
+++ hacks/webcollage Thu Sep 9 20:46:42 1999
@@ -81,6 +81,11 @@
--- hacks/webcollage.orig Wed Nov 22 17:10:34 2000
+++ hacks/webcollage Mon Feb 26 01:43:25 2001
@@ -102,6 +102,11 @@
if (!-r $wordlist) {
$wordlist = "/usr/share/lib/dict/words"; # irix
$wordlist = "/usr/share/lib/dict/words"; # Irix
}
+
+if (!-r $wordlist) {

View File

@ -1,36 +0,0 @@
--- driver/Makefile.in.orig Sat Nov 11 10:44:07 2000
+++ driver/Makefile.in Sun Nov 12 11:17:08 2000
@@ -148,18 +148,16 @@
CMD_LIBS = $(LIBS) $(X_LIBS) \
$(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
-EXES = xscreensaver xscreensaver-command xscreensaver-demo
+EXES = xscreensaver xscreensaver-command
EXES2 = @ALL_DEMO_PROGRAMS@
HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \
demo-Gtk-widgets.h demo-Gtk-stubs.h
-MEN = xscreensaver.man xscreensaver-demo.man \
+MEN = xscreensaver.man \
xscreensaver-command.man
-ALL_MEN = xscreensaver.man \
- xscreensaver-demo.man xscreensaver-command.man
+ALL_MEN = xscreensaver.man xscreensaver-command.man
EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
- xscreensaver.kss xscreensaver-demo.glade \
- screensaver-properties.desktop.in .gdbinit
+ xscreensaver.kss screensaver-properties.desktop.in .gdbinit
VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \
vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
@@ -214,10 +212,6 @@
$(install_prefix)$(bindir)/xscreensaver-command ; \
$(INSTALL_PROGRAM) xscreensaver-command \
$(install_prefix)$(bindir)/xscreensaver-command
- @echo $(INSTALL_PROGRAM) xscreensaver-demo \
- $(install_prefix)$(bindir)/xscreensaver-demo ; \
- $(INSTALL_PROGRAM) xscreensaver-demo \
- $(install_prefix)$(bindir)/xscreensaver-demo
install-ad: XScreenSaver.ad
@if [ ! -d $(install_prefix)$(AD_DIR) ]; then \

View File

@ -1,16 +1,16 @@
xscreensaver will run several programs to continuously update the
screen instead of going blank. You can specify the programs and their
arguments using resources.
Xscreensaver will run several programs to continuously update the
screen instead of going blank. You can specify the programs and their
arguments using resources. You can also add dpms (power saver) options.
Xscreensaver will make use of any installed OpenGL libraries, such as
Mesa (also in the ports collection).
It doesn't work very well with my XF86_S3 with the MIT-SCREEN-SAVER
extension, so it is disabled in config.h. It makes very little
difference anyway as the saver still watches the keyboard and mouse
activity.
The client-server model employed by xscreensaver make it a superior choice
to xlock, since no seperate auto-locking program is needed. It's also
extremely easy to add new programs like xearth, or any other program that
can fill the root window as additional screensavers.
WWW: http://www.jwz.org/xscreensaver/
-Satoshi
asami@cs.berkeley.edu
- Doug Barton
DougB@FreeBSD.org

View File

@ -33,6 +33,7 @@ bin/galaxy
bin/gears
bin/gflux
bin/glplanet
bin/gltext
bin/goop
bin/grav
bin/greynetic
@ -92,6 +93,8 @@ bin/sproingies
bin/squiral
bin/stairs
bin/starfish
bin/starwars
bin/stonerview
bin/strange
bin/superquadrics
bin/swirl
@ -102,17 +105,18 @@ bin/vidwhacker
bin/vines
bin/wander
bin/webcollage
bin/whirlwindwarp
bin/worm
bin/xflame
bin/xjack
bin/xlyap
bin/xmatrix
bin/xrayswarm
bin/xroger
bin/xscreensaver
bin/xscreensaver-command
bin/xscreensaver-gl-helper
bin/xspirograph
bin/xsublim
bin/xteevee
bin/zoom
lib/X11/app-defaults/XScreenSaver