Changeset 29612 for main/trunk/package-kits/linux

Timestamp:

2014-12-12T18:01:21+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Got Pacman working (again)

File:

• main/trunk/package-kits/linux/perllib/Greenstone/Package/_pacman.pm (modified) (4 diffs)

main/trunk/package-kits/linux/perllib/Greenstone/Package/_pacman.pm

@@ -54 +54 @@
         exists $self->{config}->{PRE_REMOVE} or
         exists $self->{config}->{POST_REMOVE}) {
-        my $file = "$self->{output}/$self->{config}->{NAME}.install";
+        my $name = "$self->{config}->{NAME}.install";
+        my $file = "$self->{output}/$name";
         print "    - $file\n";
         open my $INSTALL, '>', $file;
@@ -70 +71 @@
             $self->write_function ("post_remove", $INSTALL, @{$self->{config}->{POST_REMOVE}});
         close $INSTALL;
-        return "install=$file";
+        return "install=$name";
     } else {
         return "";
@@ -76 +77 @@
 }
 
+sub add_package_function {
+    my ($self, $name, $out) = @_;
+    $self->write_function ("package_$name", $out,
+        'pkgdesc=%DESCRIPTION%',
+        'arch=(%ARCHITECTURE%)',
+        'depends=(',
+        '%DEPENDS%',
+        ')',
+        'optdepends=(',
+        '%OPTDEPENDS%',
+        ')',
+        'provides=(',
+        '%PROVIDES%',
+        ')',
+        $self->add_install,
+        "DESTDIR=\${pkgdir} make install_$name",
+    );
+    
+}
+
 sub add_package_impl {
     my ($self, $packages) = @_;
+    my $name = $self->{config}->{NAME};
     $self->{config}->{NAMES} = $self->{config}->{NAME};
     if (defined $packages) {
         for my $package (@{$packages}) {
-            $self->{config}->{NAMES} .= " $package->{NAME}";
+            $self->{config}->{NAMES} .= " $name-$package->{NAME}";
         }
     }
@@ -115 +137 @@
     if (defined $packages) {
         # main package
-        $self->write_function ("package_$self->{config}->{NAME}", $PKGBUILD,
-            $self->add_install,
-            'DESTDIR=${pkgdir} make install'
-        );
+        $self->add_package_function ("$self->{config}->{NAME}", $PKGBUILD);
         my $config = $self->{config};
         # subpackages
         for my $package (@{$packages}) {
             $self->{config} = $package;
-            $self->write_function ("package_$package->{NAME}", $PKGBUILD,
-                'pkgdesc=%DESCRIPTION%',
-                'arch=(%ARCHITECTURE%)',
-                'depends=(',
-                '%DEPENDS%',
-                ')',
-                'optdepends=(',
-                '%OPTDEPENDS%',
-                ')',
-                'provides=(',
-                '%PROVIDES%',
-                ')',
-                $self->add_install,
-                'DESTDIR=${pkgdir} make install_%NAME%',
-            );
+            $self->add_package_function ("$name-$package->{NAME}", $PKGBUILD);
         }
         $self->{config} = $config;
     } else {
+        for my $line (
+            'arch=(%ARCHITECTURE%)',
+            'depends=(',
+            '%DEPENDS%',
+            ')',
+            'optdepends=(',
+            '%OPTDEPENDS%',
+            ')',
+            'provides=(',
+            '%PROVIDES%',
+            ')',
+        ) {
+            my $copy = $line;
+            $self->subst ($copy);
+            print $PKGBUILD $copy, "\n";
+        }
         print $PKGBUILD $self->add_install, "\n";
         $self->write_function ('package', $PKGBUILD, 'DESTDIR=${pkgdir} make install');