- avoid pulling in gawk if installed at build time, pointed out by

Mike on the Openbsd-newbies mailing list.

- add libiconv support, bump PKGNAME
This commit is contained in:
sthen 2009-04-18 09:02:05 +00:00
parent 6cd25685eb
commit c451636ee3
2 changed files with 20 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2009/04/13 13:23:35 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2009/04/18 09:02:05 sthen Exp $
COMMENT-main = little brother's database, email address query tools
COMMENT-ldap = LDAP support for little brother's database
@ -6,8 +6,8 @@ COMMENT-ldap = LDAP support for little brother's database
VERSION = 0.36
DISTNAME = lbdb_${VERSION}
PKGNAME-main = lbdb-${VERSION}
PKGNAME-ldap = lbdb-ldap-${VERSION}
PKGNAME-main = lbdb-${VERSION}p0
PKGNAME-ldap = lbdb-ldap-${VERSION}p0
CATEGORIES = databases mail
@ -27,7 +27,9 @@ RUN_DEPENDS-main = ::textproc/gsed \
RUN_DEPENDS-ldap = ::databases/p5-ldap \
:${FULLPKGNAME-main}:databases/lbdb
WANTLIB = c
MODULES = converters/libiconv
WANTLIB-main = c
LIB_DEPENDS-ldap =
MASTER_SITES = http://www.spinnaker.de/debian/
@ -37,6 +39,7 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --libdir=${PREFIX}/lib/lbdb \
--with-libiconv-prefix=${LOCALBASE} \
--without-abook \
--without-addr-email \
--without-niscat \
@ -45,7 +48,10 @@ CONFIGURE_ARGS += --libdir=${PREFIX}/lib/lbdb \
--without-pgp \
--without-evolution-addressbook-export \
--enable-lbdb-dotlock
CONFIGURE_ENV = ac_cv_path_BASH=false
CONFIGURE_ENV = ac_cv_path_BASH=false \
ac_cv_path_GAWK=false \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
WRKDIST = ${WRKDIR}/${DISTNAME:S/_/-/}

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.1 2009/04/18 09:02:05 sthen Exp $
--- Makefile.in.orig Sat Apr 18 09:54:34 2009
+++ Makefile.in Sat Apr 18 09:54:48 2009
@@ -189,4 +189,4 @@ Makefile: Makefile.in
-e 's!@''dotlock@!$(DOTLOCKBASE)!' $@.in > $@
%.o: %.c
- $(CC) $(CFLAGS) $(DEFS) -c $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<