diff options
| -rwxr-xr-x | freebsd.install.sh | 31 | ||||
| -rw-r--r-- | freebsd.local.217.pkg-descr (renamed from freebsd.pkg-descr) | 0 | ||||
| -rw-r--r-- | freebsd.local.Makefile | 8 | ||||
| -rw-r--r-- | freebsd.local.Makefile.inc | 7 |
4 files changed, 20 insertions, 26 deletions
diff --git a/freebsd.install.sh b/freebsd.install.sh index 29dfb7f..a55e1bd 100755 --- a/freebsd.install.sh +++ b/freebsd.install.sh @@ -11,32 +11,11 @@ msg_and_mkdir () { } : ${PORTSDIR:="/usr/ports"} -if [ '!' -d "${PORTSDIR}/local" ]; then +[ '!' -d "${PORTSDIR}/local" ] && \ msg_and_mkdir "${PORTSDIR}/local" - - echo "=> Generating ${PORTSDIR}/local/Makefile" 2>&1 - cat << EOF > "${PORTSDIR}/local/Makefile" -# \$FreeBSD\$ -# - - COMMENT = Local ports - - SUBDIR += 217 - -.include <bsd.port.subdir.mk> -EOF - - echo "=> Generating ${PORTSDIR}/local/Makefile.inc" 2>&1 - cat << EOF > "${PORTSDIR}/local/Makefile.inc" -# $FreeBSD$ -# - -PKGNAMEPREFIX?= local- - -# Make sure we have the correct origin registered -PKGCATEGORY= local -EOF - -fi +[ '!' -f "${PORTSDIR}/local/Makefile" ] && \ + msg_and_copy "freebsd.local.Makefile" "${PORTSDIR}/local/Makefile" +[ '!' -f "${PORTSDIR}/local/Makefile.inc" ] && \ + msg_and_copy "freebsd.local.Makefile.inc" "${PORTSDIR}/local/Makefile.inc" msg_and_copy "freebsd.out/217" "${PORTSDIR}/local" diff --git a/freebsd.pkg-descr b/freebsd.local.217.pkg-descr index 94d04ce..94d04ce 100644 --- a/freebsd.pkg-descr +++ b/freebsd.local.217.pkg-descr diff --git a/freebsd.local.Makefile b/freebsd.local.Makefile new file mode 100644 index 0000000..4c31876 --- /dev/null +++ b/freebsd.local.Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ +# + + COMMENT = Local ports + + SUBDIR += 217 + +.include <bsd.port.subdir.mk> diff --git a/freebsd.local.Makefile.inc b/freebsd.local.Makefile.inc new file mode 100644 index 0000000..3cc3077 --- /dev/null +++ b/freebsd.local.Makefile.inc @@ -0,0 +1,7 @@ +# $FreeBSD$ +# + +PKGNAMEPREFIX?= local- + +# Make sure we have the correct origin registered +PKGCATEGORY= local |