diff options
| -rw-r--r-- | x11/xscreensaver/Makefile | 3 | ||||
| -rw-r--r-- | x11/xscreensaver/pkg-libwarning | 6 |
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. |