Index: head/net/jabberd/Makefile =================================================================== --- head/net/jabberd/Makefile (revision 96939) +++ head/net/jabberd/Makefile (revision 96940) @@ -1,44 +1,64 @@ # New ports collection makefile for: jabberd # Date created: 29 December 2003 # Whom: Dmitry Sivachenko # # $FreeBSD$ # PORTNAME= jabberd PORTVERSION= 2.0.1 CATEGORIES= net MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/ DISTNAME= ${PORTNAME}-2.0s1 DIST_SUBDIR= jabber MAINTAINER= demon@FreeBSD.org COMMENT= Online presence and instant messaging server GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-openssl=/usr \ - --with-libiconv-prefix=${LOCALBASE} +CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ + --enable-storage='${STORAGE}' \ + --enable-authreg='${AUTHREG}' -.if defined(WITH_BDB) -LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 -CONFIGURE_ARGS+=--with-berkeley-db=${LOCALBASE} \ - --enable-storage=db \ - --enable-authreg=db -LDFLAGS+= -ldb41 -CFLAGS+= -I${LOCALBASE}/include/db41 +STORAGE+= fs +AUTHREG+= anon pipe + +.if defined(WITH_PGSQL) +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client +CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/include:${LOCALBASE}/lib +STORAGE+= pgsql +AUTHREG+= pgsql .endif .if defined(WITH_MYSQL) USE_MYSQL= yes -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --enable-storage=mysql \ - --enable-authreg=mysql +CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}/include/mysql:${LOCALBASE}/lib/mysql +STORAGE+= mysql +AUTHREG+= mysql .endif +.if defined(WITH_BDB) +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +CONFIGURE_ARGS+=--with-berkeley-db=${LOCALBASE}/include/db41:${LOCALBASE}/lib +STORAGE+= db +AUTHREG+= db +.endif + .if defined(WITH_LDAP) USE_OPENLDAP= yes +CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}/include:${LOCALBASE}/lib +AUTHREG+= ldap .endif MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8 + +pre-everything:: + @${ECHO} + @${ECHO} "You can build jabberd with the following options:" + @${ECHO} "WITH_PGSQL use PostgreSQL for storage and authentication" + @${ECHO} "WITH_BDB use Berkeley DB for storage and authentication" + @${ECHO} "WITH_MYSQL use MySQL for storage and authentication" + @${ECHO} "WITH_LDAP use LDAP for authentication" + @${ECHO} .include Property changes on: head/net/jabberd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/jabberd/files/patch-configure =================================================================== --- head/net/jabberd/files/patch-configure (revision 96939) +++ head/net/jabberd/files/patch-configure (revision 96940) @@ -1,20 +1,11 @@ --- configure.orig Mon Dec 29 16:07:44 2003 +++ configure Mon Dec 29 16:07:56 2003 -@@ -23698,7 +23698,7 @@ - fi; - - if test "$places" = "search"; then -- places="std /usr/local/include/db4:/usr/local/lib /usr/local -+ places="std /usr/local/include/db41:/usr/local/lib /usr/local - /usr/local/BerkeleyDB.4.1 /usr/include/db4:/usr/lib - /sw/include/db4:/sw/lib" - fi @@ -23734,7 +23734,7 @@ ;; esac - for db_libname in db-4.1 db-4 db4 db; do + for db_libname in db-4.1 db-4 db41 db; do # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of Property changes on: head/net/jabberd/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-im/jabberd/Makefile =================================================================== --- head/net-im/jabberd/Makefile (revision 96939) +++ head/net-im/jabberd/Makefile (revision 96940) @@ -1,44 +1,64 @@ # New ports collection makefile for: jabberd # Date created: 29 December 2003 # Whom: Dmitry Sivachenko # # $FreeBSD$ # PORTNAME= jabberd PORTVERSION= 2.0.1 CATEGORIES= net MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/ DISTNAME= ${PORTNAME}-2.0s1 DIST_SUBDIR= jabber MAINTAINER= demon@FreeBSD.org COMMENT= Online presence and instant messaging server GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-openssl=/usr \ - --with-libiconv-prefix=${LOCALBASE} +CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ + --enable-storage='${STORAGE}' \ + --enable-authreg='${AUTHREG}' -.if defined(WITH_BDB) -LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 -CONFIGURE_ARGS+=--with-berkeley-db=${LOCALBASE} \ - --enable-storage=db \ - --enable-authreg=db -LDFLAGS+= -ldb41 -CFLAGS+= -I${LOCALBASE}/include/db41 +STORAGE+= fs +AUTHREG+= anon pipe + +.if defined(WITH_PGSQL) +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client +CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/include:${LOCALBASE}/lib +STORAGE+= pgsql +AUTHREG+= pgsql .endif .if defined(WITH_MYSQL) USE_MYSQL= yes -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --enable-storage=mysql \ - --enable-authreg=mysql +CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}/include/mysql:${LOCALBASE}/lib/mysql +STORAGE+= mysql +AUTHREG+= mysql .endif +.if defined(WITH_BDB) +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +CONFIGURE_ARGS+=--with-berkeley-db=${LOCALBASE}/include/db41:${LOCALBASE}/lib +STORAGE+= db +AUTHREG+= db +.endif + .if defined(WITH_LDAP) USE_OPENLDAP= yes +CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}/include:${LOCALBASE}/lib +AUTHREG+= ldap .endif MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8 + +pre-everything:: + @${ECHO} + @${ECHO} "You can build jabberd with the following options:" + @${ECHO} "WITH_PGSQL use PostgreSQL for storage and authentication" + @${ECHO} "WITH_BDB use Berkeley DB for storage and authentication" + @${ECHO} "WITH_MYSQL use MySQL for storage and authentication" + @${ECHO} "WITH_LDAP use LDAP for authentication" + @${ECHO} .include Property changes on: head/net-im/jabberd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-im/jabberd/files/patch-configure =================================================================== --- head/net-im/jabberd/files/patch-configure (revision 96939) +++ head/net-im/jabberd/files/patch-configure (revision 96940) @@ -1,20 +1,11 @@ --- configure.orig Mon Dec 29 16:07:44 2003 +++ configure Mon Dec 29 16:07:56 2003 -@@ -23698,7 +23698,7 @@ - fi; - - if test "$places" = "search"; then -- places="std /usr/local/include/db4:/usr/local/lib /usr/local -+ places="std /usr/local/include/db41:/usr/local/lib /usr/local - /usr/local/BerkeleyDB.4.1 /usr/include/db4:/usr/lib - /sw/include/db4:/sw/lib" - fi @@ -23734,7 +23734,7 @@ ;; esac - for db_libname in db-4.1 db-4 db4 db; do + for db_libname in db-4.1 db-4 db41 db; do # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of Property changes on: head/net-im/jabberd/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property