The attached diff makes courier-authlib and courier-imap use
${PORTSDIR}/infrastructure/bin/libtool instead of gnu libtool.
Comments? OKs?
ciao,
david
Index: courier-authlib/Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- courier-authlib/Makefile 23 Jun 2010 16:31:22 -0000 1.13
+++ courier-authlib/Makefile 23 Sep 2010 14:20:08 -0000
@@ -13,6 +13,12 @@ PKGNAME-mysql= ${DISTNAME:S/lib-/lib-my
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
+REVISION-main= 0
+REVISION-ldap= 0
+REVISION-mysql= 0
+REVISION-pgsql= 0
+REVISION-userdb= 0
+
SHARED_LIBS += courierauth 1.0 # .0.0
SHARED_LIBS += courierauthsasl 1.0 # .0.0
SHARED_LIBS += courierauthsaslclient 0.0 # .0.0
@@ -39,7 +45,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE
EXTRACT_SUFX= .tar.bz2
USE_GMAKE= Yes
-USE_LIBTOOL= gnu
+USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
Index: courier-authlib/patches/patch-bdbobj_Makefile_in
===================================================================
RCS file: courier-authlib/patches/patch-bdbobj_Makefile_in
diff -N courier-authlib/patches/patch-bdbobj_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ courier-authlib/patches/patch-bdbobj_Makefile_in 23 Sep 2010 14:20:08
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bdbobj/Makefile.in.orig Thu Sep 23 15:30:22 2010
++++ bdbobj/Makefile.in Thu Sep 23 15:30:44 2010
+@@ -73,7 +73,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+ testbdb_OBJECTS = $(am_testbdb_OBJECTS)
+ testbdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+- $(testbdb_LDFLAGS) $(LDFLAGS) -o $@
++ $(LDFLAGS) -o $@
+ SCRIPTS = $(noinst_SCRIPTS)
+ DEFAULT_INCLUDES = -...@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/../depcomp
Index: courier-imap/Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- courier-imap/Makefile 22 Sep 2010 06:53:03 -0000 1.62
+++ courier-imap/Makefile 23 Sep 2010 14:20:08 -0000
@@ -6,9 +6,9 @@ COMMENT-pop3= pop3 server for maildir f
V= 4.8.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
-REVISION-main= 0
+REVISION-main= 1
FULLPKGNAME-pop3= courier-pop3-${V}
-REVISION-pop3= 0
+REVISION-pop3= 1
FULLPKGPATH-pop3= mail/courier-imap,-pop3
CATEGORIES= mail
@@ -28,8 +28,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c courierauth courierauthsasl gdbm idn
USE_GMAKE= Yes
-#XXX db not found ?
-USE_LIBTOOL= gnu
+USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
Index: courier-imap/patches/patch-bdbobj_Makefile_in
===================================================================
RCS file: courier-imap/patches/patch-bdbobj_Makefile_in
diff -N courier-imap/patches/patch-bdbobj_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ courier-imap/patches/patch-bdbobj_Makefile_in 23 Sep 2010 14:20:08
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bdbobj/Makefile.in.orig Thu Sep 23 15:56:00 2010
++++ bdbobj/Makefile.in Thu Sep 23 15:56:23 2010
+@@ -73,7 +73,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+ testbdb_OBJECTS = $(am_testbdb_OBJECTS)
+ testbdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+- $(testbdb_LDFLAGS) $(LDFLAGS) -o $@
++ $(LDFLAGS) -o $@
+ SCRIPTS = $(noinst_SCRIPTS)
+ DEFAULT_INCLUDES = -...@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/../depcomp
