summaryrefslogtreecommitdiffstats
path: root/graphics/povray
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/povray')
-rw-r--r--graphics/povray/README6
-rw-r--r--graphics/povray/doinst.sh10
-rw-r--r--graphics/povray/povray.SlackBuild83
-rw-r--r--graphics/povray/povray.info6
-rw-r--r--graphics/povray/prebuild.patch23
5 files changed, 60 insertions, 68 deletions
diff --git a/graphics/povray/README b/graphics/povray/README
index 130b8d799a..31aa3347f6 100644
--- a/graphics/povray/README
+++ b/graphics/povray/README
@@ -1,5 +1,5 @@
POV-Ray: The Persistence of Vision Raytracer is a high-quality,
-totally free tool for creating stunning three-dimensional graphics.
+totally free tool for creating stunning 3D graphics.
The author of POV-Ray asks users who build their own binaries to
include their name and e-mail in the final result.
@@ -7,7 +7,7 @@ include their name and e-mail in the final result.
The included SlackBuild offers this possibility by entering the
information on the command line like this:
- # POVRAY_BUILDER="your name <email@address>" ./povray.SlackBuild
+# POVRAY_BUILDER="your name <email@address>" ./povray.SlackBuild
-If you leave this variable empty, it will be supplied by the
+If you leave this variable empty, it's supplied by the
SlackBuild script as "`whoami` on `hostname`"
diff --git a/graphics/povray/doinst.sh b/graphics/povray/doinst.sh
index 9e6e7818eb..f374d1b79a 100644
--- a/graphics/povray/doinst.sh
+++ b/graphics/povray/doinst.sh
@@ -11,10 +11,10 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
-config etc/povray/@VERSION@/povray.conf.new
-config etc/povray/@VERSION@/povray.ini.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+if [ -e etc/povray/@VERSION@/povray.conf.new ]; then
+ config etc/povray/@VERSION@/povray.conf.new
fi
+if [ -e etc/povray/@VERSION@/povray.ini.new ]; then
+ config etc/povray/@VERSION@/povray.ini.new
+fi
diff --git a/graphics/povray/povray.SlackBuild b/graphics/povray/povray.SlackBuild
index b6372da8c2..71cbf2e775 100644
--- a/graphics/povray/povray.SlackBuild
+++ b/graphics/povray/povray.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for povray:
# the Persistence of Vision Raytracer
-# Maintainer: Klaatu
-# Thanks to: Franzen
+# Maintainer: Klaatu <klaatu@member.fsf.org>
+# Thanks to Franzen
# Copyright 2009,2011,2013 Niels Horn, Rio de Janeiro, RJ, Brazil
# All rights reserved.
@@ -25,25 +25,43 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20230620 bkw: currently, sbopkglint complains:
+# Running test: 40-newconfig...
+# --- doinst.sh doesn't handle .new config files:
+# -rw-r--r-- 1 root root 4369 Jun 20 00:19 ./etc/povray/3.8/povray.conf.new
+# -rw-r--r-- 1 root root 2494 Jun 20 00:19 ./etc/povray/3.8/povray.ini.new
+# ...but ignore it, because the doinst.sh does handle the config files,
+# it's just that sbopkglint isn't (yet?) smart enough to understand it.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=povray
-VERSION=${VERSION:-3.7.0.0}
-BUILD=${BUILD:-2}
+SRCNAM=povunix
+VERSION=${VERSION:-3.8.0_beta.2}
+SRCVER=${SRCVER:-v3.8.0-beta.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
DOCDIR=${DOCDIR:-/usr/doc}
MANDIR=${MANDIR:-/usr/man}
-# The "short" version number is needed later:
-SHORT_VERSION=$( echo $VERSION | cut -f1-2 -d. )
+# Short version number is generated during compilation
+SHORTVER=$( echo $VERSION | cut -f1-2 -d. )
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If PRINT_PACKAGE_NAME is set, print the name of the package
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -51,8 +69,8 @@ OUTPUT=${OUTPUT:-/tmp}
POVRAY_BUILDER=${POVRAY_BUILDER:-"$(whoami) on $(hostname)"}
# povray prefers -O3 to build, so we do not use the -O2 flag
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-march=i686 -mtune=i686"
@@ -70,11 +88,9 @@ set -e
rm -rf $TMP/$PRGNAM-$VERSION $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-if [ -f $CWD/v$VERSION.tar.?z* ]; then
- tar xvf $CWD/v$VERSION.tar.?z*
-else
- tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-fi
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$SRCVER-src.tar.?z* \
+ --strip-components=1 -C $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -83,19 +99,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# make sure no bundled static libs can be used
-rm -r libraries
-
(
cd unix
- sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
# Prevent march=nativ for compatibility
sed "s/native/$ARCH/g" -i configure.ac
- # By disabling march=nativ, compatibilitybreaking optimizations like sse4 may arize by prebuild.sh
+ # By disabling march=nativ, compatibility-breaking optimizations may arise
sed "s/ax_x86_cpuflags=.*/unset ax_x86_cpuflags/g" -i config/ax_x86_arch.m4
- # prevent creating files in $HOME while building
- patch prebuild.sh $CWD/prebuild.patch
- sh ./prebuild.sh
)
CXXFLAGS="$SLKCFLAGS" \
@@ -104,6 +113,7 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
+ --docdir=$DOCDIR \
--mandir=$MANDIR \
--build=$ARCH-slackware-linux \
LIBS="-lboost_system -lboost_thread" \
@@ -119,25 +129,30 @@ find $PKG/$MANDIR -type f -exec gzip -9 {} \;
for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
# Rename configuration files to .new, will be checked by doinst.sh
-mv $PKG/etc/$PRGNAM/$SHORT_VERSION/$PRGNAM.conf \
- $PKG/etc/$PRGNAM/$SHORT_VERSION/$PRGNAM.conf.new
-mv $PKG/etc/$PRGNAM/$SHORT_VERSION/$PRGNAM.ini \
- $PKG/etc/$PRGNAM/$SHORT_VERSION/$PRGNAM.ini.new
+mv $PKG/etc/$PRGNAM/$SHORTVER/$PRGNAM.conf \
+ $PKG/etc/$PRGNAM/$SHORTVER/$PRGNAM.conf.new
+mv $PKG/etc/$PRGNAM/$SHORTVER/$PRGNAM.ini \
+ $PKG/etc/$PRGNAM/$SHORTVER/$PRGNAM.ini.new
+
+# fix scripts
+find $PKG/usr/share/$PRGNAM-$SHORTVER/scripts/ -type f \
+ -name "*.sh" | xargs sed -i "s/\r//"
-# ./configure does not accept docdir; move docs manually as needed
+# ./configure ignores DOCDIR; move docs manually
if [ "$DOCDIR" != "/usr/share/doc" ]; then
mkdir -p $PKG/$DOCDIR/$PRGNAM-$VERSION
- mv $PKG/usr/share/doc/$PRGNAM-$SHORT_VERSION/* $PKG/$DOCDIR/$PRGNAM-$VERSION/
- rm -r $PKG/usr/share/doc
+ mv $PKG/usr/share/doc/$PRGNAM-$SHORTVER $PKG/$DOCDIR/$PRGNAM-$VERSION
+ rmdir $PKG/usr/share/doc
fi
-cp -a COPYING INSTALL $PKG/$DOCDIR/$PRGNAM-$VERSION
+cp -a COPYING INSTALL AUTHORS changes.txt revision.txt \
+ README.md kde_install.sh $PKG/$DOCDIR/$PRGNAM-$VERSION
find $PKG/$DOCDIR/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
cat $CWD/$PRGNAM.SlackBuild > $PKG/$DOCDIR/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s,@VERSION@,$SHORT_VERSION,g" $CWD/doinst.sh > $PKG/install/doinst.sh
+sed "s,@VERSION@,$VERSION,g" $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/graphics/povray/povray.info b/graphics/povray/povray.info
index 5f8c0b00f8..66f4375bed 100644
--- a/graphics/povray/povray.info
+++ b/graphics/povray/povray.info
@@ -1,8 +1,8 @@
PRGNAM="povray"
-VERSION="3.7.0.0"
+VERSION="3.8.0_beta.2"
HOMEPAGE="http://www.povray.org/"
-DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz"
-MD5SUM="c6866a3d71e38754f24b11da6c996b8e"
+DOWNLOAD="https://github.com/POV-Ray/povray/releases/download/v3.8.0-beta.2/povunix-v3.8.0-beta.2-src.tar.gz"
+MD5SUM="c4eb48935009b5b5387b4b676da38c9d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/graphics/povray/prebuild.patch b/graphics/povray/prebuild.patch
deleted file mode 100644
index 7a4a203e29..0000000000
--- a/graphics/povray/prebuild.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- prebuild.sh.orig 2016-07-03 14:54:38.000000000 +0200
-+++ prebuild.sh 2016-07-03 14:56:10.000000000 +0200
-@@ -642,19 +642,6 @@
- for f in \$\$filelist ; do \\
- \$(INSTALL_DATA) \$(top_srcdir)/doc/\$\$f \$(DESTDIR)\$(povdocdir)/\$\$f && echo "\$(DESTDIR)\$(povdocdir)/\$\$f" >> \$(povinstall); \\
- done
-- @echo "Creating user directories..."; \\
-- for p in \$(povuser) \$(povconfuser) ; do \\
-- \$(mkdir_p) \$\$p && chown \$(povowner) \$\$p && chgrp \$(povgroup) \$\$p && printf "%s\\n" "\$\$p" "\`cat \$(povinstall)\`" > \$(povinstall); \\
-- done
-- @echo "Copying user configuration and INI files..."; \\
-- for f in povray.conf povray.ini ; do \\
-- if test -f \$(povconfuser)/\$\$f; then \\
-- echo "Creating backup of \$(povconfuser)/\$\$f"; \\
-- mv -f \$(povconfuser)/\$\$f \$(povconfuser)/\$\$f.bak; \\
-- fi; \\
-- done; \\
-- \$(INSTALL_DATA) \$(top_srcdir)/povray.conf \$(povconfuser)/povray.conf && chown \$(povowner) \$(povconfuser)/povray.conf && chgrp \$(povgroup) \$(povconfuser)/povray.conf && echo "\$(povconfuser)/povray.conf" >> \$(povinstall); \\
-- \$(INSTALL_DATA) \$(top_builddir)/povray.ini \$(povconfuser)/povray.ini && chown \$(povowner) \$(povconfuser)/povray.ini && chgrp \$(povgroup) \$(povconfuser)/povray.ini && echo "\$(povconfuser)/povray.ini" >> \$(povinstall)
-
- # Remove data, config, and empty folders for 'make uninstall'.
- # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-05-25 06:22:39 +0000