diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2002-06-14 02:09:42 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2002-06-14 02:09:42 +0000 |
| commit | b3948bfd5868f6bf77282e5b01b502b9eb23e584 (patch) | |
| tree | 931ed229e5d1019aff4bf381c0cc4d4234ff1ab4 /x11/xscreensaver | |
| parent | Update to 20020216 version. (diff) | |
* Add a feature I have used locally for a while, namely the ability to
tell configure that you want something other than zippy for fortunes.
* Change the method of displaying the warning message to one that is
friendlier to displaying multi-line instructions.
* Conditionally include webcollage-helper in the PLIST depending on
whether it was built by xscreensaver or not (which in turn depends
on the existence of gdk-pixbuf).
Notes
Notes:
svn path=/head/; revision=61240
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/Makefile | 13 | ||||
| -rw-r--r-- | x11/xscreensaver/pkg-libwarning | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index b52e0bd6c23b..14424b6c35a1 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -35,11 +35,16 @@ CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \ .include <bsd.port.pre.mk> +.if defined(XS_WITH_ALL_FORTUNES) +CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa" +.endif + .if defined(HAVE_GNOME) && defined(WITH_GNOME) USE_GNOME= yes CONFIGURE_ARGS+= --with-gnome .else CONFIGURE_ARGS+= --without-gnome +.undef HAVE_GNOME .endif CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml @@ -73,7 +78,7 @@ MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \ pre-fetch: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) - ${SH} ${MASTERDIR}/pkg-libwarning + @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || 1) .endif post-patch: @@ -86,4 +91,10 @@ post-patch: ${WRKSRC}/hacks/glx/${file} .endfor +post-install: + @(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \ + ${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \ + ${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \ + ${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi) + .include <bsd.port.post.mk> diff --git a/x11/xscreensaver/pkg-libwarning b/x11/xscreensaver/pkg-libwarning index 2df31d554007..68e4ffbc5f55 100644 --- a/x11/xscreensaver/pkg-libwarning +++ b/x11/xscreensaver/pkg-libwarning @@ -1,7 +1,9 @@ -#!/bin/sh +There is currently a conflict between configure for this port, +and pkgconfig. If your build fails, do the following: -if [ "$2" = "POST-INSTALL" -o -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi +make clean +pkg_delete -f pkgconfig* +make install -/usr/bin/dialog --msgbox "There is currently a conflict between configure for this port, and pkgconfig. If your build fails, do the following: 'make clean ; pkg_delete -f pkgconfig*'. The conflict is being worked on, but until it's fixed this is your best chance of success." 12 70 || /usr/bin/false +The conflict is being worked on, but until it's fixed this is your +best chance of success. |