[88778] trunk/dports/sysutils/logrotate

[ryandesign at macports.org]

Revision: 88778
          http://trac.macports.org/changeset/88778
Author:   ryandesign at macports.org
Date:     2012-01-11 08:23:52 -0800 (Wed, 11 Jan 2012)
Log Message:
-----------
logrotate: use proper -L and -I flags so that clang can compile it; see #32851

Modified Paths:
--------------
    trunk/dports/sysutils/logrotate/Portfile
    trunk/dports/sysutils/logrotate/files/patch-Makefile.diff

Modified: trunk/dports/sysutils/logrotate/Portfile
===================================================================
--- trunk/dports/sysutils/logrotate/Portfile	2012-01-11 16:16:36 UTC (rev 88777)
+++ trunk/dports/sysutils/logrotate/Portfile	2012-01-11 16:23:52 UTC (rev 88778)
@@ -23,7 +23,6 @@
 checksums           rmd160  cec3bc6a4cb4226b31696977935818695027b0f8 \
                     sha256  c12471e70ae8bc923bd5c4f25e8fd6483b68c6301f3cd79f7cfe37bc5b370169
 
-patch.pre_args      -p1
 patchfiles          patch-Makefile.diff
 
 depends_run         port:popt port:gettext
@@ -45,7 +44,7 @@
                     CXX="${configure.cxx} [get_canonical_archflags]" \
                     CPP="${configure.cpp} [get_canonical_archflags]" \
                     BASEDIR="${prefix}" \
-                    POPT_DIR="${prefix}/include" \
+                    POPT_DIR="${prefix}" \
                     STATEFILE="${prefix}/var/run/logrotate/logrotate.status" \
                     DEFAULT_MAIL_COMMAND="/usr/sbin/mail"
 

Modified: trunk/dports/sysutils/logrotate/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/logrotate/files/patch-Makefile.diff	2012-01-11 16:16:36 UTC (rev 88777)
+++ trunk/dports/sysutils/logrotate/files/patch-Makefile.diff	2012-01-11 16:23:52 UTC (rev 88778)
@@ -1,6 +1,16 @@
---- a/Makefile	2011-10-04 10:35:54.000000000 -0700
-+++ b/Makefile	2011-10-04 10:38:40.000000000 -0700
-@@ -80,6 +80,22 @@
+--- Makefile.orig	2011-08-31 07:39:04.000000000 -0500
++++ Makefile	2012-01-11 10:17:56.000000000 -0600
+@@ -72,14 +72,30 @@
+ endif
+ 
+ ifneq ($(POPT_DIR),)
+-    CFLAGS += -I$(POPT_DIR)
+-    LOADLIBES += -L$(POPT_DIR)
++    CFLAGS += -I$(POPT_DIR)/include
++    LOADLIBES += -L$(POPT_DIR)/lib
+ endif
+ 
+ ifneq ($(STATEFILE),)
      CFLAGS += -DSTATEFILE=\"$(STATEFILE)\"
  endif
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120111/428b8e0e/attachment.html>