Christer Solskogen wrote:
Building apache22 works fine, but installing it gives me the following
output.
Looks like the changes portrevision bump to 4 caused this. I'll see
what I can do about it.
clement 2008-09-03 13:19:24 UTC
FreeBSD ports repository
Modified files:
www/apache22 Makefile Makefile.modules pkg-plist
Log:
- Fix plist where apr_dbd is used
- Fix Postgresql build, don't trust pg_config
- Don't overwrite apr_dbd_mysql.c
- Bump PORTREVISION
No cookie for: clement
Revision Changes Path
1.225 +1 -5 ports/www/apache22/Makefile
1.29 +8 -1 ports/www/apache22/Makefile.modules
1.90 +13 -1 ports/www/apache22/pkg-plist
http://cvsweb.FreeBSD.org/ports/www/apache22/Makefile.diff?r1=1.224&r2=1.225&f=h
| --- ports/www/apache22/Makefile 2008/09/02 12:26:37 1.224
| +++ ports/www/apache22/Makefile 2008/09/03 13:19:24 1.225
| @@ -2,14 +2,14 @@
| # Date created: Dec 11 2004
| # Whom: Clement Laforet <[EMAIL
PROTECTED]>
| #
| -# $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile,v 1.224
2008/09/02 12:26:37 clement Exp $
| +# $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile,v 1.225
2008/09/03 13:19:24 clement Exp $
| #
| # For more information, please read Makefile.doc
| #
|
| PORTNAME= apache
| PORTVERSION= 2.2.9
| -PORTREVISION= 3
| +PORTREVISION= 4
| CATEGORIES= www
| MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
| DISTNAME= httpd-${PORTVERSION}
| @@ -199,10 +199,6 @@ pre-everything::
| show-options:
| @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
|
| -post-extract:
| - @${INSTALL_DATA} ${FILESDIR}/apr_dbd_mysql.c \
| - ${WRKSRC}/srclib/apr-util/dbd/
| -
| post-patch:
| @${RM} -f ${WRKSRC}/docs/docroot/*.bak
| @${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
http://cvsweb.FreeBSD.org/ports/www/apache22/Makefile.modules.diff?r1=1.28&r2=1.29&f=h
| --- ports/www/apache22/Makefile.modules 2008/09/02 12:26:37 1.28
| +++ ports/www/apache22/Makefile.modules 2008/09/03 13:19:24 1.29
| @@ -9,7 +9,7 @@
| # gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist
> tmp
| # mv tmp pkg-plist
| #
| -# $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile.modules,v
1.28 2008/09/02 12:26:37 clement Exp $
| +# $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile.modules,v
1.29 2008/09/03 13:19:24 clement Exp $
| #
|
| .if !defined(Module_inc)
| @@ -120,22 +120,29 @@ CFLAGS+= -I${LOCALBASE}/include/mysql -D
| LDFLAGS+= -L${LOCALBASE}/lib/mysql
| CONFIGURE_ENV+= LIBS="${LIBS}"
| WITH_THREADS= YES
| +PLIST_SUB+= MYSQL=""
| .else
| CONFIGURE_ARGS+= --without-mysql
| +PLIST_SUB+= MYSQL="@comment"
| .endif
|
| .if defined(WITH_PGSQL)
| USE_PGSQL= YES
| CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}
| +CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""
| +PLIST_SUB+= PGSQL=""
| .else
| CONFIGURE_ARGS+= --without-pgsql
| +PLIST_SUB+= PGSQL="@comment"
| .endif
|
| .if defined(WITH_SQLITE)
| USE_SQLITE= YES
| CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE}
| +PLIST_SUB+= SQLITE3=""
| .else
| CONFIGURE_ARGS+= --without-sqlite3
| +PLIST_SUB+= SQLITE3="@comment"
| .endif
|
| .if !defined(WITHOUT_SSL)
http://cvsweb.FreeBSD.org/ports/www/apache22/pkg-plist.diff?r1=1.89&r2=1.90&f=h
| --- ports/www/apache22/pkg-plist 2008/08/31 23:00:27 1.89
| +++ ports/www/apache22/pkg-plist 2008/09/03 13:19:24 1.90
| @@ -1,4 +1,4 @@
| [EMAIL PROTECTED] $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/www/apache22/pkg-plist,v 1.89
2008/08/31 23:00:27 clement Exp $
| [EMAIL PROTECTED] $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/www/apache22/pkg-plist,v 1.90
2008/09/03 13:19:24 clement Exp $
| [EMAIL PROTECTED] mkdir -p %D/lib/apr-util-1
| @exec mkdir -p %D/etc/apache22/extra 2> /dev/null
| @exec mkdir -p %D/etc/apache22/Includes 2> /dev/null || true
| @@ -174,6 +174,18 @@ include/apache22/util_xml.h
| %%APR_PORTS%%lib/libaprutil-1.la
| %%APR_PORTS%%lib/libaprutil-1.so
| %%APR_PORTS%%lib/libaprutil-1.so.3
| +%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so
| +%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so
| +%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la
| +%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a
| +%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so
| +%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so
| +%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
| +%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
| +%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so
| +%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
| +%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
| +%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
| libexec/apache22/httpd.exp
| %%MOD_ACTIONS%%libexec/apache22/mod_actions.so
| %%MOD_ALIAS%%libexec/apache22/mod_alias.so
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
