changeset 139:8076ef442b6c

editors: merge .sh and .info
author David Demelier <markand@malikania.fr>
date Mon, 11 Mar 2019 15:49:38 +0100
parents b3f3b8ed8cf2
children ef65bd5eb573
files editors/nano/nano.info editors/nano/nano.sh
diffstat 2 files changed, 42 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/editors/nano/nano.info	Mon Mar 11 15:44:15 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=nano
-PKGVERSION=3.2
-PKGREVISION=1
-PKGLICENSE="GPLv3"
-PKGSUMMARY="GNU nano editor"
-PKGDOWNLOAD="https://www.nano-editor.org/dist/v3/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/ncurses"
-PKGOPTIONS="COLOR MULTIBUFFER NANORC NLS"
-
-if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
-fi
--- a/editors/nano/nano.sh	Mon Mar 11 15:44:15 2019 +0100
+++ b/editors/nano/nano.sh	Mon Mar 11 15:49:38 2019 +0100
@@ -15,18 +15,32 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=nano
+PKGVERSION=3.2
+PKGREVISION=1
+PKGLICENSE="GPLv3"
+PKGSUMMARY="GNU nano editor"
+PKGDOWNLOAD="https://www.nano-editor.org/dist/v3/$PKGNAME-$PKGVERSION.tar.xz"
+PKGDEPENDS="lib/ncurses"
+PKGOPTIONS="COLOR MULTIBUFFER NANORC NLS"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 : ${COLOR:=yes}
 : ${MULTIBUFFER:=yes}
 : ${NANORC:=yes}
 : ${NLS:=yes}
 
-source ./nano.info
-
-set -ex
+if [ "$NLS" = "yes" ]; then
+	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	with_nls="--enable-nls"
+else
+	with_nls="--disable-nls"
+fi
 
 if [ "$COLOR" = "yes" ]; then
 	with_color="--enable-color"
@@ -46,30 +60,30 @@
 	with_nanorc="--disable-nanorc"
 fi
 
-if [ "$NLS" = "yes" ]; then
-	with_nls="--enable-nls"
-else
-	with_nls="--disable-nls"
-fi
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--target=$CTARGET \
-	--prefix=/usr \
-	--with-wordbounds \
-	$with_color \
-	$with_multibuffer \
-	$with_nanorc \
-	$with_nls
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-wordbounds \
+		$with_color \
+		$with_multibuffer \
+		$with_nanorc \
+		$with_nls
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}