summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--contrib/PKGBUILD14
-rw-r--r--docs/netcfg-profiles.5.txt4
3 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index d7fab11..3c4e3a4 100644
--- a/Makefile
+++ b/Makefile
@@ -73,11 +73,11 @@ netcfg-$(VERSION).tar.xz: | docs
pkgbuild: PKGBUILD
PKGBUILD: netcfg-$(VERSION).tar.xz
- sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum netcfg-$(VERSION).tar.xz | cut -d ' ' -f 1)/" contrib/PKGBUILD > PKGBUILD
+ sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum $< | cut -d ' ' -f 1)/" contrib/PKGBUILD > PKGBUILD
upload: netcfg-$(VERSION).tar.xz
- md5sum netcfg-$(VERSION).tar.xz > MD5SUMS.$(VERSION)
- scp netcfg-$(VERSION).tar.xz MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/
+ md5sum $< > MD5SUMS.$(VERSION)
+ scp $< MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/
clean:
$(MAKE) -C docs clean
diff --git a/contrib/PKGBUILD b/contrib/PKGBUILD
index bdeec17..9fadd7d 100644
--- a/contrib/PKGBUILD
+++ b/contrib/PKGBUILD
@@ -7,14 +7,14 @@ pkgdesc="Network configuration and profile scripts"
url="http://archlinux.org"
license=("BSD")
backup=(etc/iftab etc/conf.d/netcfg)
-depends=("coreutils" "dhcpcd>=4.0" "iproute2")
+depends=("coreutils" "dhcpcd" "iproute2")
#makedepends=('asciidoc') # The source tarball includes pre-built documentation.
-optdepends=('dialog: Required for menu based profile and wifi selectors'
- 'bridge-utils: To set up bridge connections'
- 'wpa_supplicant: required for wireless network support'
- 'wpa_actiond: Required for automatic wireless connection with rc.d/net-auto-wireless'
- 'ifplugd: Required for automatic wired connection with rc.d/net-auto-wired'
- 'wireless_tools: Required for net-rename'
+optdepends=('dialog: for the menu based profile and wifi selectors'
+ 'bridge-utils: for bridge connections'
+ 'wpa_supplicant: for wireless networking support'
+ 'wpa_actiond: for automatic wireless connections through rc.d/net-auto-wireless'
+ 'ifplugd: for automatic wired connections through rc.d/net-auto-wired'
+ 'wireless_tools: for interface renaming through net-rename'
)
source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.xz)
arch=(any)
diff --git a/docs/netcfg-profiles.5.txt b/docs/netcfg-profiles.5.txt
index e39209f..b032c9b 100644
--- a/docs/netcfg-profiles.5.txt
+++ b/docs/netcfg-profiles.5.txt
@@ -9,7 +9,7 @@ netcfg-profiles - netcfg profiles documentation and syntax
DESCRIPTION
-----------
The *netcfg*(8) profiles are plain text files that defines variables for
-netcfg behaviour. They must be compliant with *bash*(1) shell syntax and
+netcfg behavior. They must be compliant with *bash*(1) shell syntax and
usually do not execute any code.
They are named '/etc/network.d/$\{profile_name}', where
@@ -30,7 +30,7 @@ Profiles must define mandatory variables:
Connections define how the network is set up for the profile and also
determine additional configuration variable that control their
-behaviour. The available connection types are determined by files in
+behavior. The available connection types are determined by files in
'/usr/lib/network/connections/'.