diff --git a/devel/git/Makefile b/devel/git/Makefile index d4a851d99a9..357fbe8d579 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.9 2007/04/20 08:44:40 bernd Exp $ +# $OpenBSD: Makefile,v 1.10 2007/04/28 09:18:51 bernd Exp $ COMMENT-main= "GIT - Tree History Storage Tool" COMMENT-svn= "GIT - subversion interoperability tools" V= 1.5.1.1 DISTNAME= git-${V} -PKGNAME-main= ${DISTNAME} -PKGNAME-svn= git-svn-${V} +PKGNAME-main= ${DISTNAME}p0 +PKGNAME-svn= git-svn-${V}p0 CATEGORIES= devel HOMEPAGE= http://git.or.cz/ @@ -34,13 +34,12 @@ BUILD_DEPENDS= ::archivers/gtar \ MULTI_PACKAGES= -main -svn -WANTLIB-main= c crypto z +WANTLIB-main= c expat crypto z RUN_DEPENDS-main= ::x11/tk/8.4 \ ::net/rsync \ ::devel/p5-Error \ ${MODLIBICONV_RUN_DEPENDS} LIB_DEPENDS-main= curl.>=3::net/curl \ - expat.>=4::textproc/expat \ ${MODLIBICONV_LIB_DEPENDS} RUN_DEPENDS-svn= ::${BASE_PKGPATH} \ diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index 34382242d08..8aa0393c35e 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.6 2007/04/20 08:44:40 bernd Exp $ ---- Makefile.orig Thu Apr 12 03:41:44 2007 -+++ Makefile Fri Apr 13 13:16:37 2007 +$OpenBSD: patch-Makefile,v 1.7 2007/04/28 09:18:51 bernd Exp $ +--- Makefile.orig Wed Apr 11 19:41:44 2007 ++++ Makefile Sat Apr 28 03:16:55 2007 @@ -123,17 +123,17 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo # CFLAGS and LDFLAGS are for the users to override from the command line. @@ -31,14 +31,19 @@ $OpenBSD: patch-Makefile,v 1.6 2007/04/20 08:44:40 bernd Exp $ AR = ar TAR = tar INSTALL = install -@@ -402,7 +402,6 @@ ifeq ($(uname_S),FreeBSD) +@@ -402,10 +402,9 @@ ifeq ($(uname_S),FreeBSD) BASIC_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),OpenBSD) - NO_STRCASESTR = YesPlease NEEDS_LIBICONV = YesPlease - BASIC_CFLAGS += -I/usr/local/include - BASIC_LDFLAGS += -L/usr/local/lib +- BASIC_CFLAGS += -I/usr/local/include +- BASIC_LDFLAGS += -L/usr/local/lib ++ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include ++ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib + endif + ifeq ($(uname_S),NetBSD) + ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) @@ -482,7 +481,7 @@ ifndef NO_CURL endif diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile index 021592fb009..e28d956a258 100644 --- a/net/xmlrpc-epi/Makefile +++ b/net/xmlrpc-epi/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2007/02/08 19:00:17 todd Exp $ +# $OpenBSD: Makefile,v 1.3 2007/04/28 09:21:18 bernd Exp $ COMMENT= "XML-RPC C/C++ client-server implementation" CATEGORIES= net devel textproc DISTNAME= xmlrpc-epi-0.51 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 SHARED_LIBS += xmlrpc-epi 0.3 HOMEPAGE= http://xmlrpc-epi.sourceforge.net/ @@ -25,10 +25,8 @@ CONFIGURE_STYLE= gnu autoconf USE_LIBTOOL= Yes USE_GMAKE= Yes -CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -CFLAGS+= -I${PREFIX}/include - -LDFLAGS= -L${PREFIX}/lib -liconv +CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -liconv" CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/xmlrpc-epi diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile index 71320dba8aa..8ac1f22862c 100644 --- a/textproc/p5-XML-Sablotron/Makefile +++ b/textproc/p5-XML-Sablotron/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2006/08/03 23:55:11 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2007/04/28 09:20:14 bernd Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "perl interface to the Sablotron XSLT engine" DISTNAME= XML-Sablotron-1.0 -PKGNAME= p5-${DISTNAME}p0 +PKGNAME= p5-${DISTNAME}p1 CATEGORIES= textproc perl5 MASTER_SITES= http://download-1.gingerall.cz/download/sablot/ @@ -13,18 +13,17 @@ HOMEPAGE= http://www.gingerall.cz/ MAINTAINER= Anil Madhavapeddy MODULES= converters/libiconv -LIB_DEPENDS= sablot.>=100::textproc/sablotron \ - expat.>=4::textproc/expat +LIB_DEPENDS= sablot.>=100::textproc/sablotron # GPL/Mozilla PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= m +WANTLIB= expat m CONFIGURE_STYLE= perl -CONFIGURE_ARGS= EXPATLIBPATH="${LOCALBASE}/lib" EXPATINCPATH="${LOCALBASE}/include" SABLOTLIBPATH="${LOCALBASE}/lib" SABLOTINCPATH="${LOCALBASE}/include" +CONFIGURE_ARGS= EXPATLIBPATH="${X11BASE}/lib" EXPATINCPATH="${X11BASE}/include" SABLOTLIBPATH="${LOCALBASE}/lib" SABLOTINCPATH="${LOCALBASE}/include" .include USE_GCC3?= No diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 269b8a58b6c..0090b07d771 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.24 2006/08/03 23:55:11 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2007/04/28 09:20:14 bernd Exp $ COMMENT= "fast, compact and portable XSL/XSLT processor" V= 1.0.1 DISTNAME= Sablot-${V} -PKGNAME= sablotron-${V}p1 +PKGNAME= sablotron-${V}p2 SHARED_LIBS= sablot 101.0 CATEGORIES= textproc @@ -16,12 +16,11 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m ncurses readline stdc++ +WANTLIB= c expat m ncurses readline stdc++ MASTER_SITES= http://download-1.gingerall.cz/download/sablot/ MODULES= converters/libiconv -LIB_DEPENDS= expat.>=2::textproc/expat BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser USE_LIBTOOL= Yes @@ -32,7 +31,7 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autocfg CONFIGURE_STYLE=gnu CONFIGURE_ENV= SABLOT_GPL=1 CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static \ - --enable-debugger --with-expat-prefix=${LOCALBASE} \ + --enable-debugger --with-expat-prefix=${X11BASE} \ --with-iconv-prefix=${LOCALBASE} --with-readline \ --with-html-dir=${PREFIX}/share/doc/sablotron