prt-get: fixed prt-get.conf for overlays and README file with notes about compiler...

[crossrootfs.git] / pkg-get / pkg-repgen.patch

diff --git a/Makefile b/Makefile
index 4327a7a..f8e4cd9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 NAME=pkg-get
-VERSION="0.4.5"
+VERSION="0.4.6"
+
+DESTDIR=
 
 PREFIX=/usr
 CFGDIR=/etc
@@ -7,11 +9,11 @@ CFGDIR=/etc
 all:
 	@echo "Use 'make install' to install pkg-get"
 
-man:    
+man:
 	makeman doc/pkg-get.8.txt
 	makeman doc/pkg-repgen.8.txt
 	man2ps doc/pkg-get.8 | ps2pdf14 - > doc/pkg-get.pdf
-                
+
 dist: man
 	rm -rf ${NAME}-${VERSION}
 	mkdir ${NAME}-${VERSION}
@@ -22,12 +24,11 @@ dist: man
 	rm -rf ${NAME}-${VERSION}
 
 install:
-
-	install -D -m 755 scripts/pkg-get.pl ${PREFIX}/bin/pkg-get
-	install -D -m 755 scripts/pkg-repgen.pl ${PREFIX}/bin/pkg-repgen
-	install -D -m 755 scripts/pkg-get.pl ${PREFIX}/bin/pkg-get
-	install -D -m 644 doc/pkg-get.8 ${PREFIX}/man/man8/pkg-get.8
-	install -D -m 644 doc/pkg-get.conf ${CFGDIR}/pkg-get.conf
-	install -D -m 644 doc/pkg-repgen.8 ${PREFIX}/man/man8/pkg-repgen.8
-	install -D -m 644 doc/pkg-get.8 ${PREFIX}/man/man8/pkg-get.8
+	install -D -m 755 scripts/pkg-get.pl ${DESTDIR}${PREFIX}/bin/pkg-get
+	install -D -m 755 scripts/pkg-repgen.pl ${DESTDIR}${PREFIX}/bin/pkg-repgen
+	install -D -m 755 scripts/pkg-get.pl ${DESTDIR}${PREFIX}/bin/pkg-get
+	install -D -m 644 doc/pkg-get.8 ${DESTDIR}${PREFIX}/man/man8/pkg-get.8
+	install -D -m 644 doc/pkg-get.conf ${DESTDIR}${CFGDIR}/pkg-get.conf
+	install -D -m 644 doc/pkg-repgen.8 ${DESTDIR}${PREFIX}/man/man8/pkg-repgen.8
+	install -D -m 644 doc/pkg-get.8 ${DESTDIR}${PREFIX}/man/man8/pkg-get.8
 
diff --git a/doc/pkg-repgen.8 b/doc/pkg-repgen.8
index 17d0609..30b58fc 100644
--- a/doc/pkg-repgen.8
+++ b/doc/pkg-repgen.8
@@ -22,6 +22,10 @@ packages are specified.
 .SH OPTIONS
 .TP
 .B
+\fB--prtdir\fP=PATH
+use prtdir to override the default used by prt-get
+.TP
+.B
 \fB--header\fP=FILE
 insert FILE at the beginning of the html index
 .TP
@@ -36,6 +40,8 @@ use the specified title for the index page
 \fBpkg-repgen\fP
 .PP
 \fBpkg-repgen\fP kdebase kdelibs
+.pp
+\fBpkg-repgen\fP --prtdir=/tmp/mytestrepo --header=/tmp/header.html
 .SH AUTHORS
 Simone Rota <sip@varlock.com>
 index generation code adapted from Jukka Heino's portspage
diff --git a/scripts/pkg-repgen.pl b/scripts/pkg-repgen.pl
index 2743ce4..0aa4e16 100755
--- a/scripts/pkg-repgen.pl
+++ b/scripts/pkg-repgen.pl
@@ -13,8 +13,9 @@ use warnings;
 use strict;
 use Getopt::Long;
 
+our $prtget = "/usr/bin/prt-get"; our $prtdir;
 our $title = "CRUX Packages"; our $header; our $footer;
-GetOptions("title=s"=>\$title, "header=s"=>\$header, "footer=s"=>\$footer);
+GetOptions("prtdir=s"=>\$prtdir, "title=s"=>\$title, "header=s"=>\$header, "footer=s"=>\$footer);
 
 if ($#ARGV >= 0) { # single packages
     pkgrepo_single();
@@ -22,6 +23,9 @@ if ($#ARGV >= 0) { # single packages
     pkgread();
     pkginst();
 } else {
+    if ($prtdir) {
+      $prtget = "$prtget --no-std-config --config-set=\"prtdir $prtdir\"";
+    }
     pkgrepo();
     pkgdeps();
     pkgread();
@@ -40,7 +44,7 @@ sub pkgdeps_single {
             my $found = 0;
             my $package = $packages[0];
             $package =~ s/#.*//;
-            my $deps = `prt-get printf "%e" --filter="$package"`;
+            my $deps = `$prtget printf "%e" --filter="$package"`;
             if ($deps ne "") {
                 my $isnew = `grep "$p .*:" PKGDEPS`;
                 if ($isnew eq ""){ # package is new, put deps at the end.
@@ -74,10 +78,10 @@ sub pkgrepo_single {
             my $du = (-s $package);
             my $md5 = `md5sum $package`;
             $md5 =~ s/  .*$|\n//g;
-            my $des=`prt-get printf %d --filter="$name"`;
+            my $des=`$prtget printf %d --filter="$name"`;
             $des =~ s/:/ /g;
             if ($des eq ""){$des = "N.A."};
-            my $flags=`prt-get printf %E:%O:%R --filter="$name"`;
+            my $flags=`$prtget printf %E:%O:%R --filter="$name"`;
             if ($flags eq "") {$flags = "no:no:no"}
             my $isnew = `grep "$p#" PKGREPO`;
             if ($isnew eq ""){ # package is new, put it at the end
@@ -107,7 +111,7 @@ sub pkgdeps {
     open (my $fh, '>PKGDEPS');
 	foreach my $package (@packages) {
         $package =~ s/#.*//;
-        my $deps = `prt-get printf "%e" --filter="$package"`;
+        my $deps = `$prtget printf "%e" --filter="$package"`;
         if ($deps ne "") {
             printf $fh "%-30s : %-s\n", $package, $deps;
         }
@@ -133,10 +137,10 @@ sub pkgrepo {
         my $du = (-s $package);
         my $md5 = `md5sum $package`;
         $md5 =~ s/  .*$|\n//g;
-        my $des=`prt-get printf %d --filter="$name"`;
+        my $des=`$prtget printf %d --filter="$name"`;
         $des =~ s/:/ /g;
         if ($des eq ""){$des = "N.A."};
-        my $flags=`prt-get printf %E:%O:%R --filter="$name"`;
+        my $flags=`$prtget printf %E:%O:%R --filter="$name"`;
         if ($flags eq "") {$flags = "no:no:no"}
         printf $fh "%-s:%-s:%-s:%-s:%-s\n", $package,$du,$md5,$des,$flags;
 		my $version = $package;
@@ -167,7 +171,7 @@ sub pkgread {
     print $fh "# README files for repository. Do NOT remove this line.\n";
 	foreach my $package (@packages) {
         $package =~ s/#.*//;
-        my $path = `prt-get path $package`;
+        my $path = `$prtget path $package`;
         $path =~ s/\n//g;
         if (-f "$path/README"){
             print $fh "##### PKGREADME: $package\n";
@@ -195,7 +199,7 @@ sub pkginst {
     my @packages = glob("*#*.pkg.tar.gz");
 	foreach my $package (@packages) {
         $package =~ s/#.*//;
-        my $path = `prt-get path $package`;
+        my $path = `$prtget path $package`;
         $path =~ s/\n//g;
         my $normal= $package;
         $normal =~ s/[^[:alnum:]]/_/g;