don't rely on inter-library dependency; maintainer timeout

x11/xscreensaver/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2004/08/10 11:16:44 xsa Exp $
+# $OpenBSD: Makefile,v 1.26 2004/10/05 14:15:22 naddy Exp $
 
 COMMENT=		"screen saver and locker for the X Window System"
 
@@ -30,6 +30,7 @@ NO_REGRESS=		Yes
 
 CONFIGURE_STYLE=	autoconf no-autoheader
 AUTOCONF_VERSION=	2.57
+AUTOCONF=		autoconf -I${LOCALBASE}/share/aclocal
 CONFIGURE_ARGS+=	--with-hackdir="${PREFIX}/libexec/xscreensaver"
 CONFIGURE_ARGS+=	--with-gl
 CONFIGURE_ARGS+=	--with-xpm

x11/xscreensaver/patches/patch-aclocal_m4

@@ -0,0 +1,35 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2004/10/05 14:15:22 naddy Exp $
+--- aclocal.m4.orig	Sat May 11 01:58:56 2002
++++ aclocal.m4	Sat Sep 25 19:01:53 2004
+@@ -10,6 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the ext
+ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ dnl PARTICULAR PURPOSE.
+ 
++m4_include(iconv.m4)
+ 
+ dnl AC_PROG_INTLTOOL([MINIMUM-VERSION])
+ # serial 1 AC_PROG_INTLTOOL
+@@ -182,12 +183,12 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
+ 	        gt_cv_func_dgettext_libintl,
+ 	        [AC_CHECK_LIB(intl, dgettext,
+ 		  gt_cv_func_dgettext_libintl=yes,
+-		  gt_cv_func_dgettext_libintl=no)],
+-	        gt_cv_func_dgettext_libintl=no)])
++		  gt_cv_func_dgettext_libintl=no, $LIBICONV)],
++	        gt_cv_func_dgettext_libintl=no)],, $LIBICONV)
+ 	  fi
+ 
+           if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+-	    LIBS="$LIBS -lintl";
++	    LIBS="$LIBS -lintl $LIBICONV";
+           fi
+ 
+ 	  if test "$gt_cv_func_dgettext_libc" = "yes" \
+@@ -293,6 +294,7 @@ unistd.h sys/param.h])
+    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+ strdup __argz_count __argz_stringify __argz_next])
+ 
++   AM_ICONV
+    AM_LC_MESSAGES
+    AM_GLIB_WITH_NLS
+