[110622] trunk/dports/security/tripwire

ryandesign at macports.org ryandesign at macports.org
Mon Sep 2 16:49:14 PDT 2013


Revision: 110622
          https://trac.macports.org/changeset/110622
Author:   ryandesign at macports.org
Date:     2013-09-02 16:49:14 -0700 (Mon, 02 Sep 2013)
Log Message:
-----------
tripwire: update to 2.4.2.2

Modified Paths:
--------------
    trunk/dports/security/tripwire/Portfile

Added Paths:
-----------
    trunk/dports/security/tripwire/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/security/tripwire/files/patch-configure
    trunk/dports/security/tripwire/files/patch-configure.in

Modified: trunk/dports/security/tripwire/Portfile
===================================================================
--- trunk/dports/security/tripwire/Portfile	2013-09-02 23:41:50 UTC (rev 110621)
+++ trunk/dports/security/tripwire/Portfile	2013-09-02 23:49:14 UTC (rev 110622)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                tripwire
-version             2.4.1.2
-revision            2
+version             2.4.2.2
 categories          security
 license             GPL-2+
 platforms           darwin
@@ -23,45 +22,43 @@
                     management, policy compliance and more.
 
 homepage            http://sourceforge.net/projects/tripwire/
-master_sites        sourceforge:tripwire/tripwire-src/tripwire-${version}-src
+master_sites        sourceforge:tripwire/tripwire-src/tripwire-${version}
 use_bzip2           yes
 distname            ${distname}-src
 
-checksums           md5     8a1147c278b528ed593023912c4b649a
+checksums           rmd160  00a307f7efae7c441a7f62e38850ead053158f6a \
+                    sha256  e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad
 
 depends_lib         port:openssl
 
 use_autoreconf      yes
 
+pre-patch {
+    move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
+}
+
 patchfiles          patch-Makefile.am    \
                     patch-platform.h     \
                     patch-aclocal.m4     \
-                    patch-configure.in   \
-                    patch-configure      \
+                    patch-configure.ac.diff \
                     patch-install.cfg    \
                     patch-install.sh     \
                     patch-src_cryptlib_algebra.h \
                     patch-src_core_archive.cpp \
                     patch-src_fco_fcospec.cpp
 
-post-patch {
-    move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
-    file attributes ${worksrcpath}/configure -permissions +x
-}
-
 pre-configure {
-    system "cd ${worksrcpath} && aclocal"
+    system -W ${worksrcpath} aclocal
 }
 
-configure.args      --sysconfdir="${prefix}/etc/${name}" \
-                    --mandir="${prefix}/share/man"
+configure.args      --sysconfdir="${prefix}/etc/${name}"
 
 # Installation locations
 set bindir          "${prefix}/sbin"
 set sysconfdir      "${prefix}/etc/${name}"
 set vardbdir        "${prefix}/var/db/${name}"
 set docdir          "${prefix}/share/doc/${name}"
-if {[variant_isset anacron]} {
+if {[variant_exists anacron] && [variant_isset anacron]} {
     set crondir     "${prefix}/etc/cron.daily"
 } else {
     set crondir     "${docdir}"

Deleted: trunk/dports/security/tripwire/files/patch-configure
===================================================================
--- trunk/dports/security/tripwire/files/patch-configure	2013-09-02 23:41:50 UTC (rev 110621)
+++ trunk/dports/security/tripwire/files/patch-configure	2013-09-02 23:49:14 UTC (rev 110622)
@@ -1,84 +0,0 @@
---- configure.orig	Mon Sep 24 19:21:28 2007
-+++ configure	Mon Sep 24 20:52:05 2007
-@@ -605,6 +605,7 @@
- PACKAGE_VERSION
- PACKAGE_STRING
- PACKAGE_BUGREPORT
-+am__isrc
- exec_prefix
- prefix
- program_transform_name
-@@ -663,6 +664,7 @@
- STRIP
- INSTALL_STRIP_PROGRAM
- mkdir_p
-+MKDIR_P
- AWK
- SET_MAKE
- am__leading_dot
-@@ -1901,7 +1903,7 @@
-   test "$program_prefix$program_suffix$program_transform_name" = \
-     NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
--am__api_version="1.8"
-+am__api_version="1.10"
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -2043,6 +2045,9 @@
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
- 
-+# added to avoid compile error, true value needs to be set to something
-+am__isrc=""
-+
- test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
-@@ -2061,6 +2066,7 @@
-   # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-   # expensive solution, as it forces Make to start a sub-shell.)
-   mkdir_p='mkdir -p -- .'
-+  MKDIR_P='mkdir -p -- .'
- else
-   # On NextStep and OpenStep, the `mkdir' command does not
-   # recognize any option.  It will interpret all options as
-@@ -2073,11 +2079,18 @@
-   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-   if test -f "$ac_aux_dir/mkinstalldirs"; then
-     mkdir_p='$(mkinstalldirs)'
-+    MKDIR_P='$(mkinstalldirs)'
-   else
-     mkdir_p='$(install_sh) -d'
-+    MKDIR_P='$(install_sh) -d'
-   fi
- fi
- 
-+# catch if MKDIR_P is empty and set to equal mkdir_p
-+ if test -z "$MKDIR_P"; then
-+  MKDIR_P=$mkdir_p
-+ fi
-+
- for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -11287,6 +11300,7 @@
- STRIP!$STRIP$ac_delim
- INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
- mkdir_p!$mkdir_p$ac_delim
-+MKDIR_P!$MKDIR_P$ac_delim
- AWK!$AWK$ac_delim
- SET_MAKE!$SET_MAKE$ac_delim
- am__leading_dot!$am__leading_dot$ac_delim
-@@ -11319,9 +11333,10 @@
- path_to_sendmail!$path_to_sendmail$ac_delim
- CPP!$CPP$ac_delim
- GREP!$GREP$ac_delim
-+am__isrc!$am__isrc$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 99; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Copied: trunk/dports/security/tripwire/files/patch-configure.ac.diff (from rev 110615, trunk/dports/security/tripwire/files/patch-configure.in)
===================================================================
--- trunk/dports/security/tripwire/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/security/tripwire/files/patch-configure.ac.diff	2013-09-02 23:49:14 UTC (rev 110622)
@@ -0,0 +1,27 @@
+--- configure.ac.orig	2011-11-21 10:06:56.000000000 -0600
++++ configure.ac	2013-09-02 18:43:41.000000000 -0500
+@@ -6,7 +6,7 @@
+ AC_CONFIG_SRCDIR([src/tw/tw.cpp])
+ AC_CANONICAL_TARGET([])
+ AM_INIT_AUTOMAKE(tripwire, 2.4.2.2)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl #################################
+ dnl Cleanup Cruft Leftover From Patch
+@@ -38,6 +38,7 @@
+ dnl ###################
+ dnl Checks for programs
+ dnl ###################
++AC_PROG_MKDIR_P
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_RANLIB
+@@ -406,6 +407,7 @@
+ dnl Export the variables we use
+ dnl #####################################
+ AC_SUBST(CORE_CRYPT_O)
++AC_SUBST([am__isrc], [' -I$(srcdir)'])
+ 
+ AC_CONFIG_FILES([
+ Makefile

Deleted: trunk/dports/security/tripwire/files/patch-configure.in
===================================================================
--- trunk/dports/security/tripwire/files/patch-configure.in	2013-09-02 23:41:50 UTC (rev 110621)
+++ trunk/dports/security/tripwire/files/patch-configure.in	2013-09-02 23:49:14 UTC (rev 110622)
@@ -1,27 +0,0 @@
---- configure.in.orig	2007-03-31 14:03:27.000000000 +1000
-+++ configure.in	2013-03-08 07:16:05.000000000 +1100
-@@ -6,7 +6,7 @@
- AC_CONFIG_SRCDIR([src/tw/tw.cpp])
- AC_CANONICAL_TARGET([])
- AM_INIT_AUTOMAKE(tripwire, 2.4.1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- dnl #################################
- dnl Cleanup Cruft Leftover From Patch
-@@ -38,6 +38,7 @@
- dnl ###################
- dnl Checks for programs
- dnl ###################
-+AC_PROG_MKDIR_P
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_RANLIB
-@@ -406,6 +407,7 @@
- dnl Export the variables we use
- dnl #####################################
- AC_SUBST(CORE_CRYPT_O)
-+AC_SUBST([am__isrc], [' -I$(srcdir)'])
- 
- AC_CONFIG_FILES([
- Makefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130902/cc1b32bc/attachment.html>


More information about the macports-changes mailing list