Ignore:
Timestamp:
Aug 8, 2011, 8:03:50 PM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/security/medusa/Portfile

    r82146 r82148  
    55name               medusa
    66version            2.0
     7revision           1
    78categories         security net
    89platforms          darwin
     
    3132                    sha1    bdea5e5c81d588af35e564a54d9eb2b77eb92371 \
    3233                    rmd160  28e27525d704621c1d897c368a58080dac12be45
    33 dist_subdir        ${name}/${version}_${revision}
     34# Remove this line at next version update
     35dist_subdir        ${name}/${version}_0
    3436
    35 depends_lib        port:openssl port:libssh2
     37depends_lib        port:openssl port:libssh2 port:pcre
    3638
    3739livecheck.type     regex
     
    4446
    4547post-patch {
    46     # not very tasteful and doesn't fully work
    47     reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/configure
     48    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/configure.in
    4849}
    4950
     
    5455                   --enable-module-postgres=no
    5556
     57# All modules end up linked with libsvn_client-1.0.dylib, even if the svn
     58# module was not requested.
     59default_variants +subversion
     60if {![variant_isset subversion]} {
     61    variant_set subversion
     62}
     63
    5664variant subversion description "Build the Subversion module" {
    57     # the apr-* detection is problematic
    58     # configure.cppflags   "-I${prefix}/include/subversion-1 -I${prefix}/include/apr-0"
    5965    configure.args-delete --enable-module-svn=no
    60     configure.args-append --enable-module-svn=yes
     66    configure.args-append --enable-module-svn=yes \
     67                          --with-subversion=${prefix}
    6168    depends_lib-append port:subversion
    6269}
  • trunk/dports/security/medusa/files/patch-configure.in.diff

    r82146 r82148  
    11--- configure.in.orig   2010-02-09 16:17:51.000000000 -0600
    2 +++ configure.in        2011-08-08 14:20:00.000000000 -0500
    3 @@ -48,20 +48,6 @@
     2+++ configure.in        2011-08-08 14:29:05.000000000 -0500
     3@@ -32,36 +32,18 @@
     4 AC_ARG_WITH(postgresql, AC_HELP_STRING([--with-postgresql=prefix], [Prefix for postgresql include directory (default = /usr)]), [postgresql_prefix="$withval"], [postgresql_prefix="/usr"])
     5 AC_ARG_WITH(afpfsng, AC_HELP_STRING([--with-afpfsng=prefix], [Prefix for afpfs-ng include directory (default = /usr)]), [afpfsng_prefix="$withval"], [afpfsng_prefix="/usr"])
     6 
     7-dnl FreeBSD was not looking in /usr/local...
     8 dnl AC_SEARCH_LIBS ?
     9-if test -d "/usr/local/lib"
     10-  then LDFLAGS="$LDFLAGS -L/usr/local/lib"
     11-fi
     12-if test -d "/usr/local/ssl/lib"
     13-  then LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib"
     14+if test -d "@PREFIX@/ssl/lib"
     15+  then LDFLAGS="$LDFLAGS -L@PREFIX@/ssl/lib"
     16 fi
     17 
     18 CFLAGS="$CFLAGS -fPIC"
     19-CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
     20+CFLAGS="$CFLAGS -I@PREFIX@/ssl/include -I${subversion_prefix}/include/subversion-1 \
     21 -I${postgresql_prefix}/include/postgresql -I${postgresql_prefix}/include/pgsql -I${afpfsng_prefix}/include/afpfs-ng"
     22 
    423 AC_CHECKING([for pthread support])
    524 AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
     
    2241 AC_CHECKING([for pcre (Perl Compatible Regular Expressions) support])
    2342 AC_CHECK_HEADER([pcre.h],
     43@@ -565,10 +547,10 @@
     44 if test x"$check_module_ssh" = "xtrue"; then
     45   if test -f "/usr/lib/libssh2.so"; then
     46     LIBSSH2_PATH="/usr/lib/libssh2.so"
     47-  elif test -f "/usr/local/lib/libssh2.so"; then
     48-    LIBSSH2_PATH="/usr/local/lib/libssh2.so"
     49-  elif test -f "/opt/local/lib/libssh2.dylib"; then
     50-    LIBSSH2_PATH="/opt/local/lib/libssh2.dylib"
     51+  elif test -f "@PREFIX@/lib/libssh2.so"; then
     52+    LIBSSH2_PATH="@PREFIX@/lib/libssh2.so"
     53+  elif test -f "@PREFIX@/lib/libssh2.dylib"; then
     54+    LIBSSH2_PATH="@PREFIX@/lib/libssh2.dylib"
     55   fi 
     56 
     57   dnl Use otool on Mac OS X
Note: See TracChangeset for help on using the changeset viewer.