summaryrefslogtreecommitdiff
path: root/source/t/xfig
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/t/xfig
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/t/xfig')
-rw-r--r--source/t/xfig/slack-desc16
-rw-r--r--source/t/xfig/xfig-3.2.5c.paths.diff20
-rw-r--r--source/t/xfig/xfig-3.2.5c.skip.missing.html.manpage.diff10
-rwxr-xr-xsource/t/xfig/xfig.SlackBuild66
-rw-r--r--source/t/xfig/xfig.fig.ad.diff8
-rw-r--r--source/t/xfig/xfig.no.pdf.ref.diff4
-rw-r--r--source/t/xfig/xfig.no.xfig_ref_en.pdf.diff10
7 files changed, 52 insertions, 82 deletions
diff --git a/source/t/xfig/slack-desc b/source/t/xfig/slack-desc
index 387dd255..06d6e4ef 100644
--- a/source/t/xfig/slack-desc
+++ b/source/t/xfig/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
xfig: xfig (interactive drawing tool)
xfig:
xfig: This package contains the binary for xfig, an interactive drawing tool
-xfig: under X. Xfig can create fig, epsf, and LaTeX files with various
-xfig: options. You will also need the transfig package so that xfig can
-xfig: export fig files as epsf and LaTeX files. This package also contains
-xfig: a set of basic examples of fig files.
-xfig:
+xfig: under X. Xfig can create fig, epsf, and LaTeX files with various
+xfig: options. You will also need the transfig package so that xfig can
+xfig: export fig files as epsf and LaTeX files. This package also contains
+xfig: a large set of example fig files.
xfig:
+xfig: Homepage: https://sourceforge.net/projects/mcj/files/
xfig:
xfig:
diff --git a/source/t/xfig/xfig-3.2.5c.paths.diff b/source/t/xfig/xfig-3.2.5c.paths.diff
deleted file mode 100644
index 7c998c6d..00000000
--- a/source/t/xfig/xfig-3.2.5c.paths.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Imakefile.orig 2012-08-09 12:14:15.000000000 -0500
-+++ ./Imakefile 2013-09-18 17:26:47.819436479 -0500
-@@ -45,7 +45,7 @@
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
-
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /etc/X11/app-defaults
-
- XCOMM Comment out the following definition for XAW3D if you don't to want to use
- XCOMM the 3d Athena Widget Set
-@@ -174,7 +174,7 @@
-
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = /usr/doc/xfig-3.2.5c
-
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
diff --git a/source/t/xfig/xfig-3.2.5c.skip.missing.html.manpage.diff b/source/t/xfig/xfig-3.2.5c.skip.missing.html.manpage.diff
deleted file mode 100644
index a09cbe43..00000000
--- a/source/t/xfig/xfig-3.2.5c.skip.missing.html.manpage.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Imakefile.orig 2012-08-09 12:14:15.000000000 -0500
-+++ ./Imakefile 2013-09-18 17:20:15.875449009 -0500
-@@ -428,7 +428,6 @@
- echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
- if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
-- $(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
- $(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
- $(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
- if [ -d html ]; then \
diff --git a/source/t/xfig/xfig.SlackBuild b/source/t/xfig/xfig.SlackBuild
index 097d4a1d..307fe0d4 100755
--- a/source/t/xfig/xfig.SlackBuild
+++ b/source/t/xfig/xfig.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2007, 2008, 2009, 2010, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,20 +20,30 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
-VERSION=3.2.5c
-BUILD=${BUILD:-3}
+PKGNAM=xfig
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ "$ARCH" = "x86_64" ]; then
@@ -42,7 +52,6 @@ else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-xfig
rm -rf $PKG
@@ -50,8 +59,8 @@ mkdir -p $PKG $TMP
cd $TMP
rm -rf xfig.$VERSION
-tar xvf $CWD/xfig.$VERSION.full.tar.xz || exit 1
-cd xfig.$VERSION || exit 1
+tar xvf $CWD/xfig-$VERSION.tar.?z || exit 1
+cd xfig-$VERSION || exit 1
chown -R root:root .
find . \
@@ -62,40 +71,41 @@ find . \
\( -perm 700 -type f \) \
-exec chmod 644 {} \;
-zcat $CWD/xfig-3.2.5c.skip.missing.html.manpage.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/xfig-3.2.5c.paths.diff.gz | patch -p1 --verbose || exit 1
# Eliminate menu choice for non-distributed (redundant) PDF documentation:
zcat $CWD/xfig.no.pdf.ref.diff.gz | patch -E -p1 --verbose || exit 1
-# Don't install PDF reference manual because the HTML manual is the same thing
-# (and also includes a Japanese translation):
-zcat $CWD/xfig.no.xfig_ref_en.pdf.diff.gz | patch -E -p1 --verbose || exit 1
+# Use aspell as a spell checker:
zcat $CWD/xfig.fig.ad.diff.gz | patch -E -p1 --verbose || exit 1
-xmkmf || exit 1
-make all $NUMJOBS || make || exit 1
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-appdefaultdir=/etc/X11/app-defaults \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --mandir=/usr/man \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-make install.man DESTDIR=$PKG || exit 1
-make install.libs DESTDIR=$PKG || exit 1
-make install.html DESTDIR=$PKG || exit 1
+
+# Don't install PDF reference manual because the HTML manual is the same thing
+# (and also includes a Japanese translation):
+rm -f $PKG/usr/doc/$PKGNAM-$VERSION/xfig_ref_en.pdf
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-# Move man page to the correct place:
-if [ -d $PKG/usr/man/man1x ]; then
- mv $PKG/usr/man/man1x $PKG/usr/man/man1
- mv $PKG/usr/man/man1/xfig.1x $PKG/usr/man/man1/xfig.1
-fi
-
+# Compress man page:
gzip -9 $PKG/usr/man/man1/*
+# Add additional documentation:
mkdir -p $PKG/usr/doc/xfig-$VERSION
cp -a \
- FIGAPPS LATEX.AND.XFIG README \
+ CHANGES FIGAPPS INSTALL README \
$PKG/usr/doc/xfig-$VERSION
-( cd $PKG/usr/doc/xfig-$VERSION
- ln -sf /usr/lib${LIBDIRSUFFIX}/X11/xfig/Libraries Libraries
-)
# If there's a CHANGES file, installing at least part of the recent history
# is useful, but don't let it get totally out of control:
diff --git a/source/t/xfig/xfig.fig.ad.diff b/source/t/xfig/xfig.fig.ad.diff
index a6082acc..f4aa2927 100644
--- a/source/t/xfig/xfig.fig.ad.diff
+++ b/source/t/xfig/xfig.fig.ad.diff
@@ -1,11 +1,11 @@
---- ./Fig.ad.orig 2012-02-16 14:21:34.000000000 -0600
-+++ ./Fig.ad 2013-09-18 17:39:13.523412641 -0500
+--- ./app-defaults/Fig.in.orig 2016-07-23 16:12:46.000000000 -0500
++++ ./app-defaults/Fig.in 2018-02-24 13:38:31.916604761 -0600
@@ -34,7 +34,7 @@
! Spell check program - put your favorite spelling check program here.
! It must write the misspelled words to standard output.
--Fig.spellcheckcommand: spell %f
-+Fig.spellcheckcommand: aspell -a %f
+-Fig.spellcheckcommand: spell %f
++Fig.spellcheckcommand: aspell -a %f
! delay before spinner automatically counts when pressed (milliseconds)
Fig.spinner_delay: 1000
diff --git a/source/t/xfig/xfig.no.pdf.ref.diff b/source/t/xfig/xfig.no.pdf.ref.diff
index ab6c80b6..d25789ee 100644
--- a/source/t/xfig/xfig.no.pdf.ref.diff
+++ b/source/t/xfig/xfig.no.pdf.ref.diff
@@ -1,5 +1,5 @@
---- ./w_cmdpanel.c.orig 2013-06-14 17:39:29.000000000 -0500
-+++ ./w_cmdpanel.c 2013-09-18 17:32:05.187426334 -0500
+--- ./src/w_cmdpanel.c.orig 2016-07-23 16:10:28.000000000 -0500
++++ ./src/w_cmdpanel.c 2018-02-24 13:36:05.267592616 -0600
@@ -215,7 +215,9 @@
menu_def help_menu_items[] = {
{"Xfig Reference (HTML)...", 0, launch_refman, False},
diff --git a/source/t/xfig/xfig.no.xfig_ref_en.pdf.diff b/source/t/xfig/xfig.no.xfig_ref_en.pdf.diff
deleted file mode 100644
index 360ba6a3..00000000
--- a/source/t/xfig/xfig.no.xfig_ref_en.pdf.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Imakefile.orig 2013-09-18 17:32:24.193425727 -0500
-+++ ./Imakefile 2013-09-18 17:33:38.835423340 -0500
-@@ -428,7 +428,6 @@
- echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
- if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
-- $(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
- $(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
- if [ -d html ]; then \
- ( cd html ; tar cf - *.* images ) | ( cd $(DESTDIR)$(XFIGDOCDIR)/html ; tar xf - ) ; fi ; \