Changeset 82267

Timestamp:

08/11/11 14:04:45 (4 years ago)

Author:

pixilla@…

Message:

sysutils/logrotate:

• Fix up variants.
• Remove unused patches
• OSX does not have strndup function so add it to config.c

Location:

users/pixilla/dports/sysutils/logrotate

Files:

• Portfile (modified) (5 diffs)
• files/patch-Makefile.diff (deleted)
• files/patch-config.c.diff (added)
• files/patch-config.h.diff (deleted)
• files/patch-examples-logrotate-default.diff (deleted)
• files/patch-logrotate.c.diff (deleted)
• files/patch-strndup.c.diff (deleted)
• files/patch-strndup.h.diff (deleted)

users/pixilla/dports/sysutils/logrotate/Portfile

@@ -7 +7 @@
 version             3.8.0
 categories          sysutils
-maintainers         markd pixilla.com:brad
+maintainers         markd openmaintainer
 platforms           darwin
 
@@ -19 +19 @@
 
 homepage            https://fedorahosted.org/logrotate/
-master_sites        https://fedorahosted.org/releases/l/o/logrotate
+master_sites        gentoo
 checksums           sha1    a79c500c4ce45177b47bb473a6bff4021af7121e \
                     rmd160  7e1e24f53db5230eee2e1db8d90fe3a33692ca01
 
-livecheck.type      regex
-livecheck.url       ${master_sites}
-livecheck.regex     ${name}-(\\d+\\.\\d+(\\.\\d+)?)${extract.suffix}
-
-patchfiles          patch-Makefile.diff \
-                    patch-examples-logrotate-default.diff \
-                    patch-config.c.diff \
-                    patch-config.h.diff \
-                    patch-logrotate.c.diff \
-                    patch-strndup.c.diff \
-                    patch-strndup.h.diff
 patch.pre_args      -p1
+patchfiles          patch-config.c.diff
 
 depends_run         port:popt port:gettext port:gzip
 
+post-extract {
+    touch ${worksrcpath}/.depend
+}
+
+post-patch {
+    reinplace "s|@@PREFIX@@|${prefix}|g" \
+        ${worksrcpath}/examples/logrotate-default
+}
+
 use_configure       no
 
-set prefix_hack     [string trimleft ${destroot}${prefix} /]
-
-destroot.env-append BASEDIR="${prefix_hack}"
-
-build.env           BASEDIR="${prefix}" \
+build.env-append \
+                    CC="${configure.cc} [get_canonical_archflags]" \
+                    CXX="${configure.cxx} [get_canonical_archflags]" \
+                    CPP="${configure.cpp} [get_canonical_archflags]" \
+                    BASEDIR="${prefix}" \
                     POPT_DIR="${prefix}/include" \
                     STATEFILE="${prefix}/var/run/logrotate/logrotate.status" \
@@ -50 +49 @@
                     USEINSTALL="install"
 
-#build.args-append   LDFLAGS="-L${prefix}/lib"
-                    
-post-patch {
-        reinplace "s|@@PREFIX@@|${prefix}|g" \
-                ${worksrcpath}/examples/logrotate-default
-}
-
+destroot.env-append BASEDIR=[string trimleft ${destroot}${prefix} /]
 destroot.keepdirs   ${destroot}${prefix}/etc/logrotate.d \
                     ${destroot}${prefix}/var/run/logrotate
-
 post-destroot {
-                xinstall -m 755 ${worksrcpath}/examples/logrotate-default \
-                        ${destroot}${prefix}/etc/logrotate.conf.sample
+        xinstall -m 755 ${worksrcpath}/examples/logrotate-default \
+    ${destroot}${prefix}/etc/logrotate.conf.sample
     xinstall -d ${destroot}${prefix}/etc/logrotate.d
     xinstall -d ${destroot}${prefix}/var/run/logrotate
@@ -68 +60 @@
 
 post-activate {
-    delete  ${prefix}/etc/logrotate.d/.turd_${name} \
-            ${prefix}/var/run/logrotate/.turd_${name}
+#    delete  ${prefix}/etc/logrotate.d/.turd_${name} \
+#            ${prefix}/var/run/logrotate/.turd_${name}
 }
 
-variant bzip2 description {change default compression to bzip} {
+variant bzip2 conflicts gzip description {Use bzip2 compression by default} {
     build.env-append    COMPRESS_COMMAND="${prefix}/bin/bzip2" \
                         COMPRESS_EXT=".bz2" \
@@ -80 +72 @@
 }
 
-default_variants    bzip2
+variant gzip conflicts bzip2 description {Use gzip compression by default} {
+    depends_run-append  port:gzip
+}
+
+if {![variant_isset gzip]} {
+    default_variants +bzip2
+    variant_set bzip2
+}
+
+livecheck.type      regex
+livecheck.url       ${master_sites}
+livecheck.regex     ${name}-(\\d+\\.\\d+(\\.\\d+)?)${extract.suffix}
 
 notes \
-"Copy ${prefix}/etc/logrotate.conf.sample to ${prefix}/etc/logrotate.conf for a start.
+"Copy ${prefix}/etc/logrotate.conf.sample to ${prefix}/etc/logrotate.conf for a start:
+\$ cp ${prefix}/etc/logrotate.conf.sample ${prefix}/etc/logrotate.conf
 Afterwards putting logrotate scripts in ${prefix}/etc/logrotate.d will cause them to 
 be executed with the following command: