[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Update: databases/gq




This enables sasl for the current gq port.

It checks for sasl as a BUILD_DEPEND because it only needs sasl.h and doesn't
need to link against libsasl itself. If you have a sasl enabled libldap (you
need to install the sasl FLAVORed openldap package) this should make the
GSSAPI mechanism work. If not, it should work like before.

I needed to patch in a --with-sasl-prefix configure option and make the port
CONFIGURE_STYLE=autoconf. If someone with a bit more knowledge of autoconf
could tell me if I did it the right way, that would be nice.

People with ldap/sasl/gssapi environments, please test this if you use gq.

-- 
Free your mind and your ass will follow -- http://www.funkaffair.de
diff -uNr --exclude CVS ./Makefile /usr/ports/databases/gq/Makefile
--- ./Makefile	Thu Apr  3 16:29:36 2003
+++ /usr/ports/databases/gq/Makefile	Mon May 19 22:01:48 2003
@@ -20,13 +20,16 @@
 
 USE_X11=	Yes
 
+BUILD_DEPENDS=  :cyrus-sasl-*:security/cyrus-sasl
 LIB_DEPENDS=	gtk.1.2,gdk.1.2::x11/gtk+ \
 		ldap,lber::databases/openldap \
 		gdk_pixbuf::graphics/gdk-pixbuf
 
 MODULES=	iconv
 
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-ldap-prefix=${LOCALBASE}
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.13
+CONFIGURE_ARGS+= --with-ldap-prefix=${LOCALBASE} \
+                 --with-sasl-prefix=${LOCALBASE}
 
 .include <bsd.port.mk>
diff -uNr --exclude CVS ./patches/patch-configure_in /usr/ports/databases/gq/patches/patch-configure_in
--- ./patches/patch-configure_in	Thu Jan  1 01:00:00 1970
+++ /usr/ports/databases/gq/patches/patch-configure_in	Mon May 19 21:35:47 2003
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- configure.in.orig	Fri Jul  5 08:49:19 2002
++++ configure.in	Mon May 19 21:35:44 2003
+@@ -123,7 +123,17 @@ AC_ARG_WITH(kerberos-prefix,
+ 	    ]
+ )
+ 
++AC_ARG_WITH(sasl-prefix,
++	    [  --with-sasl-prefix=PFX     Prefix where SASL libs and headers \
++are installed],
++	    [
++	     CPPFLAGS="$CPPFLAGS -I$with_sasl_prefix/include/sasl"
++	    ]
++)
++
+ AC_CHECK_HEADERS([sasl.h], [AC_DEFINE(HAVE_SASL)])
++
++AC_CHECK_LIB(ldap, ldap_sasl_interactive_bind_s)
+ 
+ AC_CHECK_HEADERS(iconv.h, HAVE_ICONV_H=yes)
+