summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2018-09-16 05:15:56 +0200
committer David Spencer2018-09-22 00:51:08 +0200
commit0a1cd9807372ff4e8394a8e6e332b6f3e03c58e9 (patch)
treebdb38e321cbf276a8b869539174eed05a909a75a
parent6210f98f03455d08f5d0d411a5aff7035d868a09 (diff)
downloadslackbuilds-0a1cd9807372ff4e8394a8e6e332b6f3e03c58e9.tar.gz
libraries/gnonlin: Stop building src twice.
Signed-off-by: B. Watson <yalhcru@gmail.com>
-rw-r--r--libraries/gnonlin/gnonlin.SlackBuild38
-rw-r--r--libraries/gnonlin/gnonlin.info2
2 files changed, 9 insertions, 31 deletions
diff --git a/libraries/gnonlin/gnonlin.SlackBuild b/libraries/gnonlin/gnonlin.SlackBuild
index 732ceef1d7..e9460e7d3a 100644
--- a/libraries/gnonlin/gnonlin.SlackBuild
+++ b/libraries/gnonlin/gnonlin.SlackBuild
@@ -3,11 +3,11 @@
# Slackware build script for gnonlin
# Formerly maintained by:
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Ryan P.C. McQuen | Everett, WA | <email removed>
# Now maintained by B. Watson (yalhcru@gmail.com)
-# Copyright 2010-2011 Binh Nguyen <binhvng@gmail.com>
+# Copyright 2010-2011 Binh Nguyen <email removed>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,6 +27,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20180915 bkw: stop building the 1.4.0 source twice!
+
# 20170310 bkw:
# - take over maintenance
# - i486 => i586
@@ -79,11 +81,8 @@ rm -rf $PRGNAM-$OLDVER
tar xvf $CWD/$PRGNAM-$OLDVER.tar.bz2
cd $PRGNAM-$OLDVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
./configure \
@@ -109,29 +108,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- "$DOCOPT" \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --localedir=/usr/share/locale \
- --disable-static \
- --enable-shared \
- --build=$ARCH-slackware-linux
-
-make #V=1
-make install-strip DESTDIR=$PKG
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
DOC="${DOC:-no}"
if [ "$DOC" = "yes" ]; then
diff --git a/libraries/gnonlin/gnonlin.info b/libraries/gnonlin/gnonlin.info
index b56253d047..45cb343815 100644
--- a/libraries/gnonlin/gnonlin.info
+++ b/libraries/gnonlin/gnonlin.info
@@ -1,7 +1,7 @@
PRGNAM="gnonlin"
VERSION="1.4.0"
HOMEPAGE="http://gnonlin.sourceforge.net/"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-1.4.0.tar.xz \
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gnonlin/gnonlin-1.4.0.tar.xz \
https://gstreamer.freedesktop.org/src/gnonlin/gnonlin-0.10.17.tar.bz2"
MD5SUM="106899d1ee36e18f92bb838244d585eb \
0c9e5a8f771b087fac9afa459399112e"