Attachment 105632 Details for Bug 146130 – 0007-fix-apr-1.3-apr-1.patch

[patch] 0007-fix-apr-1.3-apr-1.patch

0007-fix-apr-1.3-apr-1.patch (text/plain), 3.09 KB, created by Philip M. Gollucci on 2010-05-01 00:26:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2010-05-01 00:26:27 UTC

Size: 3.09 KB

patch

obsolete

>From b4aef2046a642854b39d8218313b87f7cfb97b53 Mon Sep 17 00:00:00 2001
>From: Philip M. Gollucci <pgollucci@p6m7g8.com>
>Date: Fri, 30 Apr 2010 19:03:13 -0400
>Subject: [PATCH 07/10] fix apr-1.3 -> apr-1
> freebsd libtool is a bit wrong for apr's abi/api versioning rules
> it nees the ltversionhacks flags
> but thats a larger change
>
>
>diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
>index 45a6e2d..207167c 100644
>--- a/devel/subversion/Makefile.common
>+++ b/devel/subversion/Makefile.common
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	subversion
> PORTVERSION=	1.6.11
>-#PORTREVISION?=	1
>+PORTREVISION?=	1
> CATEGORIES+=	devel
> MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
> 		http://svnbook.red-bean.com/en/1.5/:book
>@@ -101,7 +101,7 @@ APU_CONFIG=	apu-config
> APR_PORT=	${APACHE_PORT}
> .else
> APR_PORT=	devel/apr
>-LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/${APR_PORT}
>+LIB_DEPENDS+=	apr-1:${PORTSDIR}/${APR_PORT}
> APR_APU_DIR=	${LOCALBASE}/bin
> APR_CONFIG=	apr-1-config
> APU_CONFIG=	apu-1-config
>diff --git a/net-mgmt/ramond/Makefile b/net-mgmt/ramond/Makefile
>index 5c422e6..73a47e6 100644
>--- a/net-mgmt/ramond/Makefile
>+++ b/net-mgmt/ramond/Makefile
>@@ -22,7 +22,7 @@ PORTDOCS=	README
> 
> .include <bsd.port.pre.mk>
> 
>-LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
>+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/ramond ${PREFIX}/sbin
>diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
>index cbb43c0..7121b74 100644
>--- a/sysutils/ftwin/Makefile
>+++ b/sysutils/ftwin/Makefile
>@@ -15,7 +15,7 @@ MAINTAINER=	baptiste.daroussin@gmail.com
> COMMENT=	A useful tool to find duplicate files
> 
> LIB_DEPENDS=	puzzle.1:${PORTSDIR}/graphics/libpuzzle \
>-		apr-1.3:${PORTSDIR}/devel/apr \
>+		apr-1:${PORTSDIR}/devel/apr \
> 		pcre.0:${PORTSDIR}/devel/pcre
> 
> USE_BZIP2=	yes
>diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
>index f1880d1..154b8de 100644
>--- a/sysutils/ganglia-monitor-core/Makefile
>+++ b/sysutils/ganglia-monitor-core/Makefile
>@@ -20,7 +20,7 @@ MAINTAINER=	brooks@FreeBSD.org
> COMMENT=	Ganglia cluster monitor, monitoring daemon
> 
> LIB_DEPENDS+=	confuse:${PORTSDIR}/devel/libconfuse
>-LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
>+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
> 
> PKGINSTALL=	${WRKDIR}/pkg-install
> 
>diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
>index 59a73aa..6569d15 100644
>--- a/www/mod_security/Makefile
>+++ b/www/mod_security/Makefile
>@@ -18,7 +18,7 @@ COMMENT=	An intrusion detection and prevention engine
> MAKE_JOBS_SAFE=	yes
> 
> LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre \
>-		apr-1.3:${PORTSDIR}/devel/apr
>+		apr-1:${PORTSDIR}/devel/apr
> 
> USE_APACHE=	2.0+
> GNU_CONFIGURE=	yes
>diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
>index 96620c2..49b9ac6 100644
>--- a/www/tomcat-native/Makefile
>+++ b/www/tomcat-native/Makefile
>@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
> MAINTAINER=	ale@FreeBSD.org
> COMMENT=	Tomcat native library
> 
>-LIB_DEPENDS=	apr-1.3:${PORTSDIR}/devel/apr
>+LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}/jni/native
> 
>-- 
>1.7.0.6

Actions: View | Diff

Attachments on bug 146130: 105630 | 105631 | 105632 | 105633 | 105634