Changeset 82287

Timestamp:

08/11/11 19:33:38 (4 years ago)

Author:

pixilla@…

Message:

sysutils/logrotate:

• Fix building for different default compression engines.

Location:

users/pixilla/dports/sysutils/logrotate

Files:

• Portfile (modified) (4 diffs)
• files/patch-Makefile.diff (added)
• files/patch-config.c.diff (modified) (1 diff)

users/pixilla/dports/sysutils/logrotate/Portfile

@@ -24 +24 @@
 
 patch.pre_args      -p1
-patchfiles          patch-config.c.diff
+patchfiles          patch-config.c.diff \
+                    patch-Makefile.diff
 
 depends_run         port:popt port:gettext port:gzip
@@ -39 +40 @@
 use_configure       no
 
-build.env           CC="${configure.cc} [get_canonical_archflags]" \
+build.env-append    CC="${configure.cc} [get_canonical_archflags]" \
                     CXX="${configure.cxx} [get_canonical_archflags]" \
                     CPP="${configure.cpp} [get_canonical_archflags]" \
@@ -47 +48 @@
                     DEFAULT_MAIL_COMMAND="/usr/sbin/mail"
 
-destroot.env-append INSTALL="install" \
-                    BASEDIR=[string trimleft ${destroot}${prefix} /]
+destroot.args       INSTALL="install" \
+                    BASEDIR=[string trimleft ${destroot}${prefix} /] \
+                    MANDIR="${prefix}/share/man"
 destroot.keepdirs   ${destroot}${prefix}/etc/logrotate.d \
                     ${destroot}${prefix}/var/run/logrotate
@@ -54 +56 @@
     xinstall -m 755 ${worksrcpath}/examples/logrotate-default \
         ${destroot}${prefix}/etc/logrotate.conf.sample
-    move ${destroot}${prefix}/man/man5/logrotate.conf.5 \
-        ${destroot}${prefix}/share/man/man5/logrotate.conf.5
-    move ${destroot}${prefix}/man/man8/logrotate.8 \
-        ${destroot}${prefix}/share/man/man8/logrotate.8
 }
 
 variant bzip2 conflicts gzip description {Use bzip2 compression by default} {
-    build.env-append    COMPRESS_COMMAND="${prefix}/bin/bzip2" \
-                        COMPRESS_EXT=".bz2" \
-                        UNCOMPRESS_COMMAND="${prefix}/bin/bunzip2"
-    depends_run-append  port:bzip2
+    build.env-append \
+                    COMPRESS_COMMAND="${prefix}/bin/bzip2" \
+                    COMPRESS_EXT=".bz2" \
+                    UNCOMPRESS_COMMAND="${prefix}/bin/bunzip2"
+    depends_run-append \
+                    port:bzip2
 }
 
 variant gzip conflicts bzip2 description {Use gzip compression by default} {
-    build.env-append    COMPRESS_COMMAND="${prefix}/bin/gzip" \
-                        COMPRESS_EXT=".gz" \
-                        UNCOMPRESS_COMMAND="${prefix}/bin/gunzip"
-    depends_run-append  port:gzip
+    build.pre_args-append \
+                    COMPRESS_COMMAND="${prefix}/bin/gzip" \
+                    COMPRESS_EXT=".gz" \
+                    UNCOMPRESS_COMMAND="${prefix}/bin/gunzip"
+    depends_run-append \
+                    port:gzip
 }
 

users/pixilla/dports/sysutils/logrotate/files/patch-config.c.diff

@@ -1 @@
---- a/config.c  2011-08-11 13:50:02.000000000 -0700
-+++ b/config.c  2011-08-11 13:13:41.000000000 -0700
+--- a/config.c  2011-08-11 14:18:53.000000000 -0700
++++ b/config.c  2011-08-11 14:19:23.000000000 -0700
 @@ -74,6 +74,29 @@