summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authormycroft <mycroft@pkgsrc.org>2002-04-05 04:50:23 +0000
committermycroft <mycroft@pkgsrc.org>2002-04-05 04:50:23 +0000
commitf311fa482c81d0be3c4bb470625cbf94a3ce69ab (patch)
treebba6f7ff23c2ce5d125ac67fab0284de291278e5 /x11
parent115ce476a095e26885cb91250a6535e7f75365b0 (diff)
downloadpkgsrc-f311fa482c81d0be3c4bb470625cbf94a3ce69ab.tar.gz
Fix krb5 library linkage.
Diffstat (limited to 'x11')
-rw-r--r--x11/xscreensaver/Makefile.common6
-rw-r--r--x11/xscreensaver/distinfo3
-rw-r--r--x11/xscreensaver/patches/patch-af13
3 files changed, 20 insertions, 2 deletions
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 71ec500aa4e..2e1cfce9434 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2002/03/19 15:34:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2002/04/05 04:50:23 mycroft Exp $
#
DISTNAME= xscreensaver-4.02
@@ -9,6 +9,7 @@ MASTER_SITES= ${HOMEPAGE} \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.jwz.org/xscreensaver/
+BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= gle-[0-9]*:../../graphics/gle
DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
@@ -46,6 +47,9 @@ post-patch:
[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f
+pre-configure:
+ cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
+
.include "../../mk/bsd.prefs.mk"
.if (${OPSYS} == "NetBSD")
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index e89b74b288f..1c4e0a10979 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/03/19 15:34:32 wiz Exp $
+$NetBSD: distinfo,v 1.15 2002/04/05 04:50:23 mycroft Exp $
SHA1 (xscreensaver-4.02.tar.gz) = b32cf3ed37680669a4a7ea2b945fadb5841fc6b3
Size (xscreensaver-4.02.tar.gz) = 2201442 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 42e87cbd976e0aee890a4707b39c90fce8edc12f
SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30
SHA1 (patch-ac) = 4f201f01b65935c57efa7bfec8291f29a7ff1280
SHA1 (patch-ae) = 9209256c4dcc7bde3dd812bb8fcbad1f8b4f0f08
+SHA1 (patch-af) = a585edb4e65067e7b3913944093f9d18045d27d9
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
new file mode 100644
index 00000000000..d9a1ab8b16f
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.6 2002/04/05 04:50:23 mycroft Exp $
+
+--- configure.in.orig Mon Mar 18 23:01:26 2002
++++ configure.in Thu Apr 4 18:48:21 2002
+@@ -1512,7 +1512,7 @@
+ if test "$have_kerberos5" = yes ; then
+ # from Matt Knopp <mhat@infocalypse.netlag.com>
+ # (who got it from amu@mit.edu)
+- PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
++ PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err -lcrypt"
+ elif test "$have_kerberos" = yes ; then
+ # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2
+ PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err"