pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Start Testing on NetBSD. Minor improvement. Correct me if wrong. Tks.
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By: mef
Date: Thu Oct 8 00:19:11 2015 +0900
Changeset: 69023154bb47851550ec88338c89ddea2b0646dd
Modified Files:
fbsd2pkg/distinfo
Added Files:
fbsd2pkg/patches/patch-fbsd2pkg
fbsd2pkg/patches/patch-fbsd2pkg.awk
Log Message:
Start Testing on NetBSD. Minor improvement. Correct me if wrong. Tks.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=69023154bb47851550ec88338c89ddea2b0646dd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
fbsd2pkg/distinfo | 2 ++
fbsd2pkg/patches/patch-fbsd2pkg | 29 +++++++++++++++++++++++++++
fbsd2pkg/patches/patch-fbsd2pkg.awk | 40 +++++++++++++++++++++++++++++++++++++
3 files changed, 71 insertions(+)
diffs:
diff --git a/fbsd2pkg/distinfo b/fbsd2pkg/distinfo
index bb12892..51ae9a7 100644
--- a/fbsd2pkg/distinfo
+++ b/fbsd2pkg/distinfo
@@ -3,3 +3,5 @@ $NetBSD$
SHA1 (fbsd2pkg-0.1.tar.xz) = 450f237ac0f546452090e936881e048ba93e915a
RMD160 (fbsd2pkg-0.1.tar.xz) = c50b4e5addd5a02923b480e3826aa50e70e51350
Size (fbsd2pkg-0.1.tar.xz) = 4444 bytes
+SHA1 (patch-fbsd2pkg) = cff89804ec822ca3c4f141564efebbbb0aefe1d9
+SHA1 (patch-fbsd2pkg.awk) = be0b22e5e753f4e5e2c677db90957efffbe1bc86
diff --git a/fbsd2pkg/patches/patch-fbsd2pkg b/fbsd2pkg/patches/patch-fbsd2pkg
new file mode 100644
index 0000000..63928e9
--- /dev/null
+++ b/fbsd2pkg/patches/patch-fbsd2pkg
@@ -0,0 +1,29 @@
+$NetBSD$
+
+On NetBSD, existing test on bmake may not be necessary
+or even harmfull :-)
+
+--- fbsd2pkg.orig 2015-10-07 23:58:48.000000000 +0900
++++ fbsd2pkg 2015-10-08 00:04:02.000000000 +0900
+@@ -40,10 +40,6 @@ if [ $# != 2 ]; then
+ usage
+ fi
+
+-if ! which bmake; then
+- printf "Error: bmake not found in PATH.\n"
+- exit 1
+-fi
+
+ port_path=$1
+ maintainer=$2
+@@ -56,6 +52,10 @@ fi
+ if [ `uname` = NetBSD ]; then
+ make=make
+ else
++ if ! which bmake; then
++ printf "Error: bmake not found in PATH.\n"
++ exit 1
++ fi
+ make=bmake
+ fi
+
diff --git a/fbsd2pkg/patches/patch-fbsd2pkg.awk b/fbsd2pkg/patches/patch-fbsd2pkg.awk
new file mode 100644
index 0000000..2458027
--- /dev/null
+++ b/fbsd2pkg/patches/patch-fbsd2pkg.awk
@@ -0,0 +1,40 @@
+$NetBSD$
+
+awk: warning: escape sequence `\$' treated as plain `$'
+ source line number 56 source file /usr/pkg/libexec/fbsd2pkg/fbsd2pkg.awk
+ context is
+ master_sites = >>> "\$ <<<
+awk: warning: escape sequence `\$' treated as plain `$'
+ source line number 212 source file /usr/pkg/libexec/fbsd2pkg/fbsd2pkg.awk
+awk: warning: escape sequence `\$' treated as plain `$'
+ source line number 220 source file /usr/pkg/libexec/fbsd2pkg/fbsd2pkg.awk
+
+--- fbsd2pkg.awk.orig 2015-09-29 09:52:32.000000000 +0900
++++ fbsd2pkg.awk 2015-10-08 00:13:51.000000000 +0900
+@@ -53,7 +53,7 @@ BEGIN {
+ else if ( master_sites ~ "^SF" )
+ sf_master_sites = master_sites;
+ else if ( master_sites == "CHEESESHOP" )
+- master_sites = "\${CHEESESHOP}";
++ master_sites = "\\${CHEESESHOP}";
+ else
+ gsub("\\${PORTNAME}", portname, master_sites);
+ }
+@@ -209,7 +209,7 @@ BEGIN {
+ else if ( $1 ~ "^PKGNAMEPREFIX" )
+ {
+ pkgnameprefix=$2;
+- gsub("\\${PYTHON_PKGNAMEPREFIX}", "\${PYPKGPREFIX}-", pkgnameprefix);
++ gsub("\\${PYTHON_PKGNAMEPREFIX}", "\\${PYPKGPREFIX}-", pkgnameprefix);
+ }
+ else if ( $1 ~ "^PKGNAMESUFFIX" )
+ pkgnamesuffix=$2;
+@@ -217,7 +217,7 @@ BEGIN {
+ {
+ # Convert what we can in FreeBSD ports code that's left commented out
+ gsub("STAGEDIR", "DESTDIR", $0);
+- gsub("\\${PYTHON_PKGNAMEPREFIX}", "\${PYPKGPREFIX}-", $0);
++ gsub("\\${PYTHON_PKGNAMEPREFIX}", "\\${PYPKGPREFIX}-", $0);
+ gsub("\\${PORTSDIR}", "../..", $0);
+
+ if ( ($0 ~ "COPYTREE") && (use_tools !~ "pax") )
Home |
Main Index |
Thread Index |
Old Index