mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00
Code Issues Releases Activity

- silence a portlint warning(tab)

Browse Source 
- fix pkg-plist for LDAP case
- Bump PORTREVISION

Added file(s):
 - files/patch-apr-util-1.3.2__build__apu-conf.m4
 (Will be removed in 1.3.3 release)
 http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/apu-conf.m4?r1=668323&r2=675009&pathrev=675009&view=patch

PR:     ports/125411
Reported by:    several on ports@
Approved by:    araujo (mentor)
This commit is contained in:
Philip M. Gollucci 2008-07-29 14:04:32 +00:00
parent fde06f265c
commit 0a64105e31
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=217816
12 changed files with 144 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/apr/Makefile
View File

@ -16,6 +16,7 @@
PORTNAME= apr
PORTVERSION= 1.3.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@ -35,7 +36,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
@ -87,6 +88,7 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.endif
.if defined(APR_UTIL_WITH_LDAP)
PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
@ -95,6 +97,8 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap
.else
PKGNAMESUFFIX= -ldap
.endif
.else
PLIST_SUB+= LDAP="@comment "
.endif
pre-extract:

26
devel/apr/files/patch-apr-util-1.3.2__build__apu-conf.m4 Normal file
View File

@ -0,0 +1,26 @@
--- apr-util-1.3.2/build/apu-conf.m4 2008/06/16 21:34:50 668323
+++ apr-util-1.3.2/build/apu-conf.m4 2008/07/08 22:31:59 675009
@@ -357,6 +357,12 @@
])
if test "$apu_has_ldap_openldap" = "1"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+
+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
+ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
APR_TRY_COMPILE_NO_WARNING([
#ifdef HAVE_LBER_H
@@ -374,6 +380,10 @@
if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
fi
+
+ CPPFLAGS="$save_cppflags"
+ LDFLAGS="$save_ldflags"
+ LIBS="$save_libs"
fi
AC_SUBST(ldap_h)

5
devel/apr/pkg-plist
View File

@ -84,5 +84,10 @@ lib/libaprutil-1.a
lib/libaprutil-1.la
lib/libaprutil-1.so
lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%LDAP%%lib/apr-util-1/apr_ldap-1.so
%%LDAP%%lib/apr-util-1/apr_ldap.so
%%LDAP%%lib/apr-util-1/apr_ldap.la
%%LDAP%%lib/apr-util-1/apr_ldap.a
%%LDAP%%@dirrm lib/apr-util-1
@dirrm build-1
@dirrm include/apr-1

6
devel/apr0/Makefile
View File

@ -16,6 +16,7 @@
PORTNAME= apr
PORTVERSION= 1.3.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@ -35,7 +36,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
@ -87,6 +88,7 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.endif
.if defined(APR_UTIL_WITH_LDAP)
PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
@ -95,6 +97,8 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap
.else
PKGNAMESUFFIX= -ldap
.endif
.else
PLIST_SUB+= LDAP="@comment "
.endif
pre-extract:

26
devel/apr0/files/patch-apr-util-1.3.2__build__apu-conf.m4 Normal file
View File

@ -0,0 +1,26 @@
--- apr-util-1.3.2/build/apu-conf.m4 2008/06/16 21:34:50 668323
+++ apr-util-1.3.2/build/apu-conf.m4 2008/07/08 22:31:59 675009
@@ -357,6 +357,12 @@
])
if test "$apu_has_ldap_openldap" = "1"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+
+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
+ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
APR_TRY_COMPILE_NO_WARNING([
#ifdef HAVE_LBER_H
@@ -374,6 +380,10 @@
if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
fi
+
+ CPPFLAGS="$save_cppflags"
+ LDFLAGS="$save_ldflags"
+ LIBS="$save_libs"
fi
AC_SUBST(ldap_h)

5
devel/apr0/pkg-plist
View File

@ -84,5 +84,10 @@ lib/libaprutil-1.a
lib/libaprutil-1.la
lib/libaprutil-1.so
lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%LDAP%%lib/apr-util-1/apr_ldap-1.so
%%LDAP%%lib/apr-util-1/apr_ldap.so
%%LDAP%%lib/apr-util-1/apr_ldap.la
%%LDAP%%lib/apr-util-1/apr_ldap.a
%%LDAP%%@dirrm lib/apr-util-1
@dirrm build-1
@dirrm include/apr-1

6
devel/apr1/Makefile
View File

@ -16,6 +16,7 @@
PORTNAME= apr
PORTVERSION= 1.3.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@ -35,7 +36,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
@ -87,6 +88,7 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.endif
.if defined(APR_UTIL_WITH_LDAP)
PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
@ -95,6 +97,8 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap
.else
PKGNAMESUFFIX= -ldap
.endif
.else
PLIST_SUB+= LDAP="@comment "
.endif
pre-extract:

26
devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 Normal file
View File

@ -0,0 +1,26 @@
--- apr-util-1.3.2/build/apu-conf.m4 2008/06/16 21:34:50 668323
+++ apr-util-1.3.2/build/apu-conf.m4 2008/07/08 22:31:59 675009
@@ -357,6 +357,12 @@
])
if test "$apu_has_ldap_openldap" = "1"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+
+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
+ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
APR_TRY_COMPILE_NO_WARNING([
#ifdef HAVE_LBER_H
@@ -374,6 +380,10 @@
if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
fi
+
+ CPPFLAGS="$save_cppflags"
+ LDFLAGS="$save_ldflags"
+ LIBS="$save_libs"
fi
AC_SUBST(ldap_h)

5
devel/apr1/pkg-plist
View File

@ -84,5 +84,10 @@ lib/libaprutil-1.a
lib/libaprutil-1.la
lib/libaprutil-1.so
lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%LDAP%%lib/apr-util-1/apr_ldap-1.so
%%LDAP%%lib/apr-util-1/apr_ldap.so
%%LDAP%%lib/apr-util-1/apr_ldap.la
%%LDAP%%lib/apr-util-1/apr_ldap.a
%%LDAP%%@dirrm lib/apr-util-1
@dirrm build-1
@dirrm include/apr-1

6
devel/apr2/Makefile
View File

@ -16,6 +16,7 @@
PORTNAME= apr
PORTVERSION= 1.3.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@ -35,7 +36,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
@ -87,6 +88,7 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.endif
.if defined(APR_UTIL_WITH_LDAP)
PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
@ -95,6 +97,8 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap
.else
PKGNAMESUFFIX= -ldap
.endif
.else
PLIST_SUB+= LDAP="@comment "
.endif
pre-extract:

26
devel/apr2/files/patch-apr-util-1.3.2__build__apu-conf.m4 Normal file
View File

@ -0,0 +1,26 @@
--- apr-util-1.3.2/build/apu-conf.m4 2008/06/16 21:34:50 668323
+++ apr-util-1.3.2/build/apu-conf.m4 2008/07/08 22:31:59 675009
@@ -357,6 +357,12 @@
])
if test "$apu_has_ldap_openldap" = "1"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+
+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
+ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
APR_TRY_COMPILE_NO_WARNING([
#ifdef HAVE_LBER_H
@@ -374,6 +380,10 @@
if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
fi
+
+ CPPFLAGS="$save_cppflags"
+ LDFLAGS="$save_ldflags"
+ LIBS="$save_libs"
fi
AC_SUBST(ldap_h)

5
devel/apr2/pkg-plist
View File

@ -84,5 +84,10 @@ lib/libaprutil-1.a
lib/libaprutil-1.la
lib/libaprutil-1.so
lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%LDAP%%lib/apr-util-1/apr_ldap-1.so
%%LDAP%%lib/apr-util-1/apr_ldap.so
%%LDAP%%lib/apr-util-1/apr_ldap.la
%%LDAP%%lib/apr-util-1/apr_ldap.a
%%LDAP%%@dirrm lib/apr-util-1
@dirrm build-1
@dirrm include/apr-1