aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorpgollucci <pgollucci@FreeBSD.org>2008-07-29 22:04:32 +0800
committerpgollucci <pgollucci@FreeBSD.org>2008-07-29 22:04:32 +0800
commit0e8f7ef8226649f770c5f622581739e3b44efb84 (patch)
treea0d3f1265579142385aa7077bf254dcba15f424a /devel
parentf4ceeffb08b79fd43b3795fe1156b0924bc28566 (diff)
downloadfreebsd-ports-gnome-0e8f7ef8226649f770c5f622581739e3b44efb84.tar.gz
freebsd-ports-gnome-0e8f7ef8226649f770c5f622581739e3b44efb84.tar.zst
freebsd-ports-gnome-0e8f7ef8226649f770c5f622581739e3b44efb84.zip
- silence a portlint warning(tab)
- 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)
Diffstat (limited to 'devel')
-rw-r--r--devel/apr/Makefile6
-rw-r--r--devel/apr/files/patch-apr-util-1.3.2__build__apu-conf.m426
-rw-r--r--devel/apr/pkg-plist5
-rw-r--r--devel/apr0/Makefile6
-rw-r--r--devel/apr0/files/patch-apr-util-1.3.2__build__apu-conf.m426
-rw-r--r--devel/apr0/pkg-plist5
-rw-r--r--devel/apr1/Makefile6
-rw-r--r--devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m426
-rw-r--r--devel/apr1/pkg-plist5
-rw-r--r--devel/apr2/Makefile6
-rw-r--r--devel/apr2/files/patch-apr-util-1.3.2__build__apu-conf.m426
-rw-r--r--devel/apr2/pkg-plist5
12 files changed, 144 insertions, 4 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 61c8e2b19101..13a15c71b6c9 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -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:
diff --git a/devel/apr/files/patch-apr-util-1.3.2__build__apu-conf.m4 b/devel/apr/files/patch-apr-util-1.3.2__build__apu-conf.m4
new file mode 100644
index 000000000000..d577cbbb58e0
--- /dev/null
+++ b/devel/apr/files/patch-apr-util-1.3.2__build__apu-conf.m4
@@ -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)
diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist
index 5023f715d620..7402d8e77672 100644
--- a/devel/apr/pkg-plist
+++ b/devel/apr/pkg-plist
@@ -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
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 61c8e2b19101..13a15c71b6c9 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -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:
diff --git a/devel/apr0/files/patch-apr-util-1.3.2__build__apu-conf.m4 b/devel/apr0/files/patch-apr-util-1.3.2__build__apu-conf.m4
new file mode 100644
index 000000000000..d577cbbb58e0
--- /dev/null
+++ b/devel/apr0/files/patch-apr-util-1.3.2__build__apu-conf.m4
@@ -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)
diff --git a/devel/apr0/pkg-plist b/devel/apr0/pkg-plist
index 5023f715d620..7402d8e77672 100644
--- a/devel/apr0/pkg-plist
+++ b/devel/apr0/pkg-plist
@@ -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
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 61c8e2b19101..13a15c71b6c9 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -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:
diff --git a/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 b/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4
new file mode 100644
index 000000000000..d577cbbb58e0
--- /dev/null
+++ b/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4
@@ -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)
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index 5023f715d620..7402d8e77672 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -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
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 61c8e2b19101..13a15c71b6c9 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -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:
diff --git a/devel/apr2/files/patch-apr-util-1.3.2__build__apu-conf.m4 b/devel/apr2/files/patch-apr-util-1.3.2__build__apu-conf.m4
new file mode 100644
index 000000000000..d577cbbb58e0
--- /dev/null
+++ b/devel/apr2/files/patch-apr-util-1.3.2__build__apu-conf.m4
@@ -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)
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index 5023f715d620..7402d8e77672 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -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
generated by cgit (git 2.34.1) at 2025-01-29 18:23:06 +0800