aboutsummaryrefslogtreecommitdiff
path: root/x11/xscreensaver
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2002-06-14 06:33:42 +0000
committerDoug Barton <dougb@FreeBSD.org>2002-06-14 06:33:42 +0000
commitffc83a37aeba1326bacaf1a854cd04b71b98601d (patch)
tree591cd85a0d5fd24e11ccd7159de7b2ed97f1358c /x11/xscreensaver
parent8cdcacf95a7991f230e246b7809c814e4b15a6b4 (diff)
downloadports-ffc83a37aeba1326bacaf1a854cd04b71b98601d.tar.gz
ports-ffc83a37aeba1326bacaf1a854cd04b71b98601d.zip
* Fix a braino with the dialog command line
* Update the warning message to encourage users to upgrade their glib12 and gtk12 ports so that their pkg-config files will be fixed.
Notes
Notes: svn path=/head/; revision=61246
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r--x11/xscreensaver/Makefile3
-rw-r--r--x11/xscreensaver/pkg-libwarning6
2 files changed, 6 insertions, 3 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 14424b6c35a1..3314abd9dae6 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -78,7 +78,8 @@ MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
pre-fetch:
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
- @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || 1)
+ @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || \
+ /usr/bin/true)
.endif
post-patch:
diff --git a/x11/xscreensaver/pkg-libwarning b/x11/xscreensaver/pkg-libwarning
index 68e4ffbc5f55..8cb4793662b4 100644
--- a/x11/xscreensaver/pkg-libwarning
+++ b/x11/xscreensaver/pkg-libwarning
@@ -5,5 +5,7 @@ make clean
pkg_delete -f pkgconfig*
make install
-The conflict is being worked on, but until it's fixed this is your
-best chance of success.
+You may also want to upgrade your complete ports tree and
+then re-install glib12 and gtk12 which will also fix the
+pkg-config files for those two ports, and should offer a
+more permanent solution.