diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2011-08-01 07:29:01 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2011-08-01 07:29:01 +0000 |
| commit | 005011b161e063abb140c927a058cf996e03edea (patch) | |
| tree | 23d10c830a0912ac8a2ef792c55812c069db0dd7 /net/netatalk | |
| parent | 03228dab743e1714cd7c03f079e781f0739a645e (diff) | |
| download | ports-005011b161e063abb140c927a058cf996e03edea.tar.gz ports-005011b161e063abb140c927a058cf996e03edea.zip | |
Notes
Diffstat (limited to 'net/netatalk')
| -rw-r--r-- | net/netatalk/Makefile | 5 | ||||
| -rw-r--r-- | net/netatalk/files/patch-configure | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 552c4b4574ca..53d81470a969 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -26,8 +26,6 @@ USE_GMAKE= yes USE_PERL5= yes WANT_GNOME= yes USE_RC_SUBR= netatalk -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --with-tcp-wrappers \ --with-pkgconfdir=${PREFIX}/etc \ @@ -111,7 +109,8 @@ USE_GNOME+= pkgconfig post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ - s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g' \ + s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure post-install: diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure index 16268021ebb7..51d9f7fadadf 100644 --- a/net/netatalk/files/patch-configure +++ b/net/netatalk/files/patch-configure @@ -1,5 +1,5 @@ --- configure.orig 2011-07-27 07:59:28.000000000 -0400 -+++ configure 2011-07-31 04:02:35.000000000 -0400 ++++ configure 2011-08-01 03:26:25.000000000 -0400 @@ -27039,6 +27039,7 @@ fi savedcflags="$CFLAGS" @@ -8,16 +8,25 @@ ICONV_CFLAGS="" ICONV_LIBS="" -@@ -31357,7 +31358,7 @@ if test "x$bdb_required" = "xyes"; then +@@ -28265,6 +28266,8 @@ echo "$as_me: error: internal error, ata + if test "x$zeroconf" != "xno"; then + savedcppflags="$CPPFLAGS" + savedldflags="$LDFLAGS" ++ CPPFLAGS="-I%%LOCALBASE%%/include $CPPFLAGS" ++ LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS" + + if test "x$zeroconf" = "xyes" -o "x$zeroconf" = "xtry"; then + zeroconf_dir="/usr" +@@ -31357,7 +31360,7 @@ if test "x$bdb_required" = "xyes"; then trybdbdir="" dobdbsearch=yes bdb_search_dirs="/usr/local /usr" - search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" -+ search_subdirs="/db46 / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" ++ search_subdirs="/%%DB_NAME%% / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" bdbfound=no savedcflags="$CFLAGS" -@@ -33387,7 +33388,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -33387,7 +33390,7 @@ rm -f core conftest.err conftest.$ac_obj fi { echo "$as_me:$LINENO: result: $netatalk_cv_HAVE_ACL_GET_PERM_NP" >&5 echo "${ECHO_T}$netatalk_cv_HAVE_ACL_GET_PERM_NP" >&6; } |