diff options
| author | Michael Haro <mharo@FreeBSD.org> | 2001-05-31 19:23:18 +0000 |
|---|---|---|
| committer | Michael Haro <mharo@FreeBSD.org> | 2001-05-31 19:23:18 +0000 |
| commit | ff71c5533253855b7558eafef43bd3d1fd113ff4 (patch) | |
| tree | de351405b2735a312d97427af1b3d7b19454a52c /ftp | |
| parent | Update Vim 5.8 (release) to patchlevel 0. (diff) | |
fix build with LDAP and MYSQL support
PR: 27431
Submitted by: Josh Elsasser <josh@elsasser.org>
Notes
Notes:
svn path=/head/; revision=43361
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 25 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 25 |
2 files changed, 26 insertions, 24 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index a121b4c6445b..039d89079cfc 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ MAINTAINER= mharo@FreeBSD.org -.if defined(WITH_LDAP) -MASTER_SITES+= http://www.horde.net/~jwm/software/proftpd-ldap/ -MOD_LDAP= mod_ldap-2.7.4.tar.bz2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MOD_LDAP} -.endif - MAN1= ftpcount.1 ftpwho.1 MAN5= xferlog.5 MAN8= proftpd.8 ftpshut.8 @@ -39,26 +33,33 @@ CONFIGURE_ARGS+= --disable-pam #allow user to override MODULES?= mod_ratio:mod_readme:mod_quota:mod_wrap +INCLUDEDIRS= +LIBDIRS= + .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_ldap BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap -CONFIGURE_ENV+= CFLAGS="-I/usr/local/include -g" LDFLAGS=-L/usr/local/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include +LIBDIRS:=${LIBDIRS}:${PREFIX}/lib .endif .if defined(WITH_MYSQL) MODULES:=${MODULES}:mod_sql:mod_sql_mysql LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ENV+= CFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib/mysql" +INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include +LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql .endif .if !empty(MODULES) CONFIGURE_ARGS+= --with-modules=${MODULES} .endif -.if defined(WITH_LDAP) -post-extract: - ${RM} -rf ${WRKSRC}/contrib/mod_ldap.c - tar --to-stdout -xvz -f ${DISTDIR}/${MOD_LDAP} */mod_ldap.c > ${WRKSRC}/contrib/mod_ldap.c +.if !empty(INCLUDEDIRS) +CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} +.endif + +.if !empty(LIBDIRS) +CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .endif pre-configure: diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index a121b4c6445b..039d89079cfc 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ MAINTAINER= mharo@FreeBSD.org -.if defined(WITH_LDAP) -MASTER_SITES+= http://www.horde.net/~jwm/software/proftpd-ldap/ -MOD_LDAP= mod_ldap-2.7.4.tar.bz2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MOD_LDAP} -.endif - MAN1= ftpcount.1 ftpwho.1 MAN5= xferlog.5 MAN8= proftpd.8 ftpshut.8 @@ -39,26 +33,33 @@ CONFIGURE_ARGS+= --disable-pam #allow user to override MODULES?= mod_ratio:mod_readme:mod_quota:mod_wrap +INCLUDEDIRS= +LIBDIRS= + .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_ldap BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap -CONFIGURE_ENV+= CFLAGS="-I/usr/local/include -g" LDFLAGS=-L/usr/local/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include +LIBDIRS:=${LIBDIRS}:${PREFIX}/lib .endif .if defined(WITH_MYSQL) MODULES:=${MODULES}:mod_sql:mod_sql_mysql LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ENV+= CFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib/mysql" +INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include +LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql .endif .if !empty(MODULES) CONFIGURE_ARGS+= --with-modules=${MODULES} .endif -.if defined(WITH_LDAP) -post-extract: - ${RM} -rf ${WRKSRC}/contrib/mod_ldap.c - tar --to-stdout -xvz -f ${DISTDIR}/${MOD_LDAP} */mod_ldap.c > ${WRKSRC}/contrib/mod_ldap.c +.if !empty(INCLUDEDIRS) +CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} +.endif + +.if !empty(LIBDIRS) +CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .endif pre-configure: |