[154375] trunk/dports/sysutils/backuppc

[mojca at macports.org]

Revision: 154375
          https://trac.macports.org/changeset/154375
Author:   mojca at macports.org
Date:     2016-10-28 23:10:19 +0200 (Fri, 28 Oct 2016)
Log Message:
-----------
backuppc: remove the perl5.22 variant (#52081) and fix paths to perl

Modified Paths:
--------------
    trunk/dports/sysutils/backuppc/Portfile
    trunk/dports/sysutils/backuppc/files/patch-progs.diff

Modified: trunk/dports/sysutils/backuppc/Portfile
===================================================================
--- trunk/dports/sysutils/backuppc/Portfile	2016-10-28 21:01:52 UTC (rev 154374)
+++ trunk/dports/sysutils/backuppc/Portfile	2016-10-28 21:10:19 UTC (rev 154375)
@@ -8,7 +8,7 @@
 name                backuppc
 categories          sysutils
 version             3.3.1
-revision            3
+revision            4
 maintainers         nomaintainer
 license             GPL-2+
 homepage            http://backuppc.sourceforge.net/
@@ -21,7 +21,6 @@
 master_sites        sourceforge
 
 # TODO:
-# - remove 5.22 once we upgrade to 5.24 as default
 # - remove the variants once mod_perl2 switches to 5.24 only
 perl5.require_variant   yes
 perl5.conflict_variants yes
@@ -78,6 +77,11 @@
 
 set hostname [exec "hostname"]
 
+post-patch {
+    reinplace "s|@@PERL@@|perl${perl5.major}|g" ${worksrcpath}/configure.pl
+    reinplace "s|@@PERL_FULL@@|${perl5.bin}|g"  ${worksrcpath}/configure.pl
+}
+
 pre-configure {
     ui_debug  "Hostname: ${hostname}"
     configure.args-append --hostname ${hostname}

Modified: trunk/dports/sysutils/backuppc/files/patch-progs.diff
===================================================================
--- trunk/dports/sysutils/backuppc/files/patch-progs.diff	2016-10-28 21:01:52 UTC (rev 154374)
+++ trunk/dports/sysutils/backuppc/files/patch-progs.diff	2016-10-28 21:10:19 UTC (rev 154375)
@@ -1,5 +1,11 @@
 --- configure.pl.orig
 +++ configure.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!@@PERL_FULL@@
+ #============================================================= -*-perl-*-
+ #
+ # configure.pl: Configuration and installation program for BackupPC
 @@ -247,8 +247,8 @@ if ( $opts{fhs} ) {
  # These are the programs whose paths we need to find
  #
@@ -6,7 +12,7 @@
  my %Programs = (
 -    perl           => "PerlPath",
 -    'gtar/tar'     => "TarClientPath",
-+    'perl5.22'     => "PerlPath",
++    '@@PERL@@'     => "PerlPath",
 +    gnutar         => "TarClientPath",
      smbclient      => "SmbClientPath",
      nmblookup      => "NmbLookupPath",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161028/a8eaee76/attachment-0002.html>