diff --git a/converters/pflogx/Makefile b/converters/pflogx/Makefile index dc19c4908ca..76560373dd8 100644 --- a/converters/pflogx/Makefile +++ b/converters/pflogx/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2007/04/12 18:59:35 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2007/04/27 18:43:05 bernd Exp $ COMMENT= "parse pf logs to XML" DISTNAME= pflogx_086 -PKGNAME= pflogx-0.86p0 +PKGNAME= pflogx-0.86p1 CATEGORIES= converters MAINTAINER= Jasper Lievisse Adriaanse @@ -15,14 +15,15 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m pcap stdc++ +WANTLIB= c expat m pcap stdc++ MASTER_SITES= ${HOMEPAGE}releases/ \ http://humppa.nl/distfiles/ -LIB_DEPENDS= expat.>=6::textproc/expat +MAKE_FLAGS= WITH_EXPAT=1 \ + EXPAT_INCLUDEDIR="${X11BASE}/include" \ + EXPAT_LIBDIR="${X11BASE}/lib" -MAKE_FLAGS= WITH_EXPAT=1 NO_REGRESS= Yes diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 04fed963daa..0ceb5cc4d97 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.44 2006/10/28 11:19:20 espie Exp $ +# $OpenBSD: Makefile,v 1.45 2007/04/27 18:40:39 bernd Exp $ COMMENT= "GNU gettext" DISTNAME= gettext-0.14.6 +PKGNAME= ${DISTNAME}p0 SHARED_LIBS += intl 3.0 # .7.3 SHARED_LIBS += asprintf 1.0 # .0.0 SHARED_LIBS += gettextlib 0.0 # .0.0 @@ -23,15 +24,14 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MODULES= converters/libiconv -LIB_DEPENDS= expat.>=4::textproc/expat -WANTLIB= c +WANTLIB= c expat USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-included-gettext \ --with-libiconv-prefix="${LOCALBASE}" \ - --with-libexpat-prefix="${LOCALBASE}" \ + --with-libexpat-prefix="${X11BASE}" \ --mandir="${PREFIX}/man" MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux diff --git a/devel/rats/Makefile b/devel/rats/Makefile index 8adf9307e46..fb8f54c637f 100644 --- a/devel/rats/Makefile +++ b/devel/rats/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2006/08/01 23:39:08 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2007/04/27 18:40:40 bernd Exp $ COMMENT= "source code auditing tool" DISTNAME= rats-2.1 +PKGNAME= ${DISTNAME}p0 CATEGORIES= devel security HOMEPAGE= http://www.securesoftware.com/rats/ @@ -14,19 +15,17 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c +WANTLIB= c expat MASTER_SITES= http://www.securesoftware.com/rats/ \ ${MASTER_SITE_PACKETSTORM:=UNIX/security/} -LIB_DEPENDS= expat.>=2::textproc/expat - CONFIGURE_STYLE= gnu dest -CONFIGURE_ARGS+= --with-expat-lib=${LOCALBASE}/lib \ - --with-expat-include=${LOCALBASE}/include \ +CONFIGURE_ARGS+= --with-expat-lib=${X11BASE}/lib \ + --with-expat-include=${X11BASE}/include \ --libdir=${WRKINST}${PREFIX}/share/rats \ --datadir=${WRKINST}${PREFIX}/share/rats -MAKE_FLAGS= CFLAGS='${CFLAGS} -I${LOCALBASE}/include \ +MAKE_FLAGS= CFLAGS='${CFLAGS} -I${X11BASE}/include \ -DHAVE_LIBEXPAT=1 -DHAVE_EXPAT_H=1 \ -DDATADIR=\"${LOCALBASE}/share/rats\"' diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile index ec18bf0a8c4..f97a183f10c 100644 --- a/textproc/p5-XML-Parser/Makefile +++ b/textproc/p5-XML-Parser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2007/01/21 21:46:21 simon Exp $ +# $OpenBSD: Makefile,v 1.13 2007/04/27 18:43:56 bernd Exp $ SHARED_ONLY= Yes @@ -6,6 +6,7 @@ COMMENT= "perl module for parsing XML documents" MODULES= cpan DISTNAME= XML-Parser-2.34 +PKGNAME= p5-${DISTNAME}p0 CATEGORIES= textproc MAINTAINER= Anil Madhavapeddy @@ -16,8 +17,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= expat.>=2::textproc/expat +WANTLIB= expat -CONFIGURE_ARGS= EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include +CONFIGURE_ARGS= EXPATLIBPATH=${X11BASE}/lib EXPATINCPATH=${X11BASE}/include .include diff --git a/www/mod_dav/Makefile b/www/mod_dav/Makefile index caf0caffa1a..64ed0ae37f1 100644 --- a/www/mod_dav/Makefile +++ b/www/mod_dav/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2006/08/04 00:10:42 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2007/04/27 18:47:07 bernd Exp $ COMMENT= "class 1 and 2 DAV server for the Apache webserver" @@ -7,7 +7,7 @@ COMMENT= "class 1 and 2 DAV server for the Apache webserver" SHARED_ONLY= Yes DISTNAME= mod_dav-1.0.3-1.3.6 -PKGNAME= mod_dav-1.0.3p1 +PKGNAME= mod_dav-1.0.3p2 CATEGORIES= www MASTER_SITES= http://www.webdav.org/mod_dav/ @@ -22,11 +22,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= expat.>=2::textproc/expat +WANTLIB= expat CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ - --with-expat=${LOCALBASE} + --with-expat=${X11BASE} SUBST_VARS= PKGNAME diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile index 07802f03fbe..610701f2f85 100644 --- a/x11/dbus/Makefile +++ b/x11/dbus/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2007/04/08 16:33:41 sturm Exp $ +# $OpenBSD: Makefile,v 1.8 2007/04/27 18:46:20 bernd Exp $ COMMENT= "message system" DISTNAME= dbus-1.0.2 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 SHARED_LIBS += dbus-1 6.0 # .5.0 CATEGORIES= x11 @@ -14,17 +14,16 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -WANTLIB= ICE X11 Xau Xdmcp SM c pthread +WANTLIB= ICE X11 Xau Xdmcp SM c expat pthread MASTER_SITES= ${HOMEPAGE}releases/dbus/ -LIB_DEPENDS= expat.>=6::textproc/expat - SEPARATE_BUILD= simple AUTOCONF_VERSION= 2.59 CONFIGURE_STYLE= gnu -CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \ +CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ + CPPFLAGS="-I${X11BASE}/include" \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" CONFIGURE_ARGS= --localstatedir=/var \ --with-dbus-user=_dbus \