Changeset 82148

Timestamp:

08/08/11 13:03:50 (4 years ago)

Author:

ryandesign@…

Message:

medusa: fix replacing /usr/local with prefix; add pcre dependency; force subversion variant always on since subversion libraries are always used even when not requested

Location:

trunk/dports/security/medusa

Files:

• Portfile (modified) (4 diffs)
• files/patch-configure.in.diff (modified) (2 diffs)

trunk/dports/security/medusa/Portfile

@@ -5 +5 @@
 name               medusa
 version            2.0
+revision           1
 categories         security net
 platforms          darwin
@@ -31 +32 @@
                     sha1    bdea5e5c81d588af35e564a54d9eb2b77eb92371 \
                     rmd160  28e27525d704621c1d897c368a58080dac12be45
-dist_subdir        ${name}/${version}_${revision}
+# Remove this line at next version update
+dist_subdir        ${name}/${version}_0
 
-depends_lib        port:openssl port:libssh2
+depends_lib        port:openssl port:libssh2 port:pcre
 
 livecheck.type     regex
@@ -44 +46 @@
 
 post-patch {
-    # not very tasteful and doesn't fully work
-    reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/configure
+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/configure.in
 }
 
@@ -54 +55 @@
                    --enable-module-postgres=no
 
+# All modules end up linked with libsvn_client-1.0.dylib, even if the svn
+# module was not requested.
+default_variants +subversion
+if {![variant_isset subversion]} {
+    variant_set subversion
+}
+
 variant subversion description "Build the Subversion module" {
-    # the apr-* detection is problematic
-    # configure.cppflags   "-I${prefix}/include/subversion-1 -I${prefix}/include/apr-0"
     configure.args-delete --enable-module-svn=no
-    configure.args-append --enable-module-svn=yes
+    configure.args-append --enable-module-svn=yes \
+                          --with-subversion=${prefix}
     depends_lib-append port:subversion
 }

trunk/dports/security/medusa/files/patch-configure.in.diff

@@ -1 +1 @@
 --- configure.in.orig   2010-02-09 16:17:51.000000000 -0600
-+++ configure.in        2011-08-08 14:20:00.000000000 -0500
-@@ -48,20 +48,6 @@
++++ configure.in        2011-08-08 14:29:05.000000000 -0500
+@@ -32,36 +32,18 @@
+ AC_ARG_WITH(postgresql, AC_HELP_STRING([--with-postgresql=prefix], [Prefix for postgresql include directory (default = /usr)]), [postgresql_prefix="$withval"], [postgresql_prefix="/usr"])
+ AC_ARG_WITH(afpfsng, AC_HELP_STRING([--with-afpfsng=prefix], [Prefix for afpfs-ng include directory (default = /usr)]), [afpfsng_prefix="$withval"], [afpfsng_prefix="/usr"])
+ 
+-dnl FreeBSD was not looking in /usr/local...
+ dnl AC_SEARCH_LIBS ?
+-if test -d "/usr/local/lib"
+-  then LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-if test -d "/usr/local/ssl/lib"
+-  then LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib"
++if test -d "@PREFIX@/ssl/lib"
++  then LDFLAGS="$LDFLAGS -L@PREFIX@/ssl/lib"
+ fi
+ 
+ CFLAGS="$CFLAGS -fPIC"
+-CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
++CFLAGS="$CFLAGS -I@PREFIX@/ssl/include -I${subversion_prefix}/include/subversion-1 \
+ -I${postgresql_prefix}/include/postgresql -I${postgresql_prefix}/include/pgsql -I${afpfsng_prefix}/include/afpfs-ng"
+ 
  AC_CHECKING([for pthread support])
  AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
@@ -22 +41 @@
  AC_CHECKING([for pcre (Perl Compatible Regular Expressions) support])
  AC_CHECK_HEADER([pcre.h], 
+@@ -565,10 +547,10 @@
+ if test x"$check_module_ssh" = "xtrue"; then
+   if test -f "/usr/lib/libssh2.so"; then
+     LIBSSH2_PATH="/usr/lib/libssh2.so"
+-  elif test -f "/usr/local/lib/libssh2.so"; then
+-    LIBSSH2_PATH="/usr/local/lib/libssh2.so"
+-  elif test -f "/opt/local/lib/libssh2.dylib"; then
+-    LIBSSH2_PATH="/opt/local/lib/libssh2.dylib"
++  elif test -f "@PREFIX@/lib/libssh2.so"; then
++    LIBSSH2_PATH="@PREFIX@/lib/libssh2.so"
++  elif test -f "@PREFIX@/lib/libssh2.dylib"; then
++    LIBSSH2_PATH="@PREFIX@/lib/libssh2.dylib"
+   fi  
+ 
+   dnl Use otool on Mac OS X