ports: aligned with upstream

diff --git a/ports/.footprint b/ports/.footprint
index ad69a2714b08b11b36c8d54c21e882c9842dae63..afcfce432a48d7a93a0d18e6e1906e103450b8da 100644 (file)
--- a/ports/.footprint
+++ b/ports/.footprint
@@ -1,12 +1,12 @@
 drwxr-xr-x     root/root       etc/
 drwxr-xr-x     root/root       etc/ports/
 -rw-r--r--     root/root       etc/ports/contrib.rsync.inactive
--rw-r--r--     root/root       etc/ports/core-armhf.rsync
+-rw-r--r--     root/root       etc/ports/core-arm.rsync
 -rw-r--r--     root/root       etc/ports/core.rsync
 drwxr-xr-x     root/root       etc/ports/drivers/
--rw-r--r--     root/root       etc/ports/opt-armhf.rsync
+-rw-r--r--     root/root       etc/ports/opt-arm.rsync
 -rw-r--r--     root/root       etc/ports/opt.rsync
--rw-r--r--     root/root       etc/ports/xorg-armhf.rsync
+-rw-r--r--     root/root       etc/ports/xorg-arm.rsync
 -rw-r--r--     root/root       etc/ports/xorg.rsync
 drwxr-xr-x     root/root       usr/
 drwxr-xr-x     root/root       usr/bin/

diff --git a/ports/.md5sum b/ports/.md5sum
index f413c712749e8e654c2fd08b0ac6bed6f652e25f..468cb1039d431079cab2fec7f3d2c8c33478756d 100644 (file)
--- a/ports/.md5sum
+++ b/ports/.md5sum
@@ -1,8 +1,8 @@
-49132c847c2d14ed0dbb61c6f53b0e1a  contrib.rsync.inactive
-ea6b5d166ce6446e78ab8b7df2fdb80b  core-armhf.rsync
-8cb8a1539dd74bb566c166877ac16856  core.rsync
-4e5adb9453c7fedce96e3d205a3cb9b9  opt-armhf.rsync
-541d0991ecf5f96ae52d1e13f481e123  opt.rsync
+1235031f24a2a6b4fcc790ebd879c973  contrib.rsync.inactive
+0c7d8129ba2387619361b2c042bdb702  core-arm.rsync
+d7ede8cfe6da977021f4217363c07d6d  core.rsync
+f7c5c97f550c4d27dad92378b0eb8602  opt-arm.rsync
+ba2755e20ca669275ee837ee9cd18c50  opt.rsync
 1f178e2bb1beab9782993931c9832280  ports-1.5.tar.gz
-a94ea8ef1ab69993ab555004b0c85f63  xorg-armhf.rsync
-efeb3ce474a4a0c67ecb62c0eaaf4e34  xorg.rsync
+440e600e67ab49cb52edbad8c6ab180f  xorg-arm.rsync
+3bb81f15783c470e116e41a2fabece90  xorg.rsync

diff --git a/ports/Pkgfile b/ports/Pkgfile
index 457d5bba61cf01d6f87a9a5b28e48895b33d29d9..9377a964e562f59040f5ae2652051b2caea24727 100644 (file)
--- a/ports/Pkgfile
+++ b/ports/Pkgfile
@@ -6,15 +6,15 @@
 
 name=ports
 version=1.5
-release=11
+release=14
 source=(http://crux.nu/files/tools/ports/$name-$version.tar.gz \
         core.rsync opt.rsync xorg.rsync contrib.rsync.inactive \
-        core-armhf.rsync opt-armhf.rsync xorg-armhf.rsync)
+        core-arm.rsync opt-arm.rsync xorg-arm.rsync)
 
 build () {
-    cd $name-$version
-    make
-    make DESTDIR=$PKG install
+  cd $name-$version
+  make
+  make DESTDIR=$PKG install
 
-    install -m 0644 $SRC/*.rsync* $PKG/etc/ports
+  install -m 0644 $SRC/*.rsync* $PKG/etc/ports
 }

diff --git a/ports/contrib.rsync.inactive b/ports/contrib.rsync.inactive
index a2697a09bade917cce3f75328bc3e1207806a999..55acbb426d744a5fdc544594344d38a1ef7e34c9 100644 (file)
--- a/ports/contrib.rsync.inactive
+++ b/ports/contrib.rsync.inactive
@@ -1,3 +1,3 @@
 host=crux.nu
-collection=ports/crux-2.8/contrib/
+collection=ports/crux-3.0/contrib/
 destination=/usr/ports/contrib

diff --git a/ports/core-armhf.rsync b/ports/core-arm.rsync
similarity index 57%
rename from ports/core-armhf.rsync
rename to ports/core-arm.rsync
index 3bb90c8152740101a6b0dc8df6e6fe08a411c958..d5ce7a7d596643190a7d45b05c71d366af77e113 100644 (file)
--- a/ports/core-armhf.rsync
+++ b/ports/core-arm.rsync
@@ -1,3 +1,3 @@
 host=crux-arm.nu
-collection=ports/crux-2.8/core-armhf/
+collection=ports/crux-3.0/core-armhf/
 destination=/usr/ports/core-armhf

diff --git a/ports/core.rsync b/ports/core.rsync
index c0d609d5d98134a97122c96927b95f80efb6ece8..4bd84018a9aa15373aa1111a9f46fe793f84bc45 100644 (file)
--- a/ports/core.rsync
+++ b/ports/core.rsync
@@ -1,3 +1,3 @@
 host=crux.nu
-collection=ports/crux-2.8/core/
+collection=ports/crux-3.0/core/
 destination=/usr/ports/core

diff --git a/ports/opt-armhf.rsync b/ports/opt-arm.rsync
similarity index 57%
rename from ports/opt-armhf.rsync
rename to ports/opt-arm.rsync
index d4d32731cd1082671e29c2c3c4718aa483a1b6d6..6f1606b1c47504905e1dcc04c6ab732dabbf615e 100644 (file)
--- a/ports/opt-armhf.rsync
+++ b/ports/opt-arm.rsync
@@ -1,3 +1,3 @@
 host=crux-arm.nu
-collection=ports/crux-2.8/opt-armhf/
+collection=ports/crux-3.0/opt-armhf/
 destination=/usr/ports/opt-armhf

diff --git a/ports/opt.rsync b/ports/opt.rsync
index 6f1df2c9a405d967e3e7a0fa7450daa2ad734732..a8220d358481732afc59a72abff609cd23b6c62e 100644 (file)
--- a/ports/opt.rsync
+++ b/ports/opt.rsync
@@ -1,3 +1,3 @@
 host=crux.nu
-collection=ports/crux-2.8/opt/
+collection=ports/crux-3.0/opt/
 destination=/usr/ports/opt

diff --git a/ports/xorg-armhf.rsync b/ports/xorg-arm.rsync
similarity index 57%
rename from ports/xorg-armhf.rsync
rename to ports/xorg-arm.rsync
index 69dbe4a9ca35d0bc1c0632dd65beaf665bc2ab41..e7f2f684ed96a5678f746fefea79a34636e9ba82 100644 (file)
--- a/ports/xorg-armhf.rsync
+++ b/ports/xorg-arm.rsync
@@ -1,3 +1,3 @@
 host=crux-arm.nu
-collection=ports/crux-2.8/xorg-armhf/
+collection=ports/crux-3.0/xorg-armhf/
 destination=/usr/ports/xorg-armhf

diff --git a/ports/xorg.rsync b/ports/xorg.rsync
index da9f2c2ca58e6c213b0f235767bfe35466d9478e..42be5e88a58e75634fb8aa3811bc149adf234bda 100644 (file)
--- a/ports/xorg.rsync
+++ b/ports/xorg.rsync
@@ -1,3 +1,3 @@
 host=crux.nu
-collection=ports/crux-2.8/xorg/
+collection=ports/crux-3.0/xorg/
 destination=/usr/ports/xorg