From b1ee6977c2b6ca27020f3fdd6fb6cd7e8c8e661f Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 22 Oct 2021 06:36:11 -0400 Subject: [PATCH] games/lmpc: Fix -current build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/lmpc/README | 18 ++++----- games/lmpc/lmpc.SlackBuild | 79 ++++++++++++++++++++------------------ games/lmpc/lmpc.info | 2 +- games/lmpc/slack-desc | 12 +++--- 4 files changed, 58 insertions(+), 53 deletions(-) diff --git a/games/lmpc/README b/games/lmpc/README index 29d0a3ee6d..3fb9e4ebf6 100644 --- a/games/lmpc/README +++ b/games/lmpc/README @@ -1,12 +1,12 @@ lmpc (The Little Movie Processing Centre) -LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and Strife -LMP files; Duke Nukem 3D and Redneck Rampage DMO files; Quake DEM -QuakeWorld QWD files; and Quake II Arena DM3 files. The DEM file cutter -tool (demcut), The DEM Text File Analyser (dema), the Broadcasting -Server (dbs) and the DM2 file concatenator (dm2cat) are part of this -package too. +LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and +Strife LMP files; Duke Nukem 3D and Redneck Rampage DMO files; +Quake DEM QuakeWorld QWD files; and Quake II Arena DM3 files. The +DEM file cutter tool (demcut), the DEM Text File Analyser (dema), the +Broadcasting Server (dbs), and the DM2 file concatenator (dm2cat) are +part of this package too. -Building this requires TeTex or TexLive to be installed, and -/usr/share/texmf/bin to be in your PATH. On a stock install, simply -enter a real root shell ("su -") before building. +In addition to the utilities, this package contains detailed +specifications on the various file formats it supports, installed in +/usr/doc/lmpc-$VERSION/. diff --git a/games/lmpc/lmpc.SlackBuild b/games/lmpc/lmpc.SlackBuild index 147e2a9995..1608dbc79e 100644 --- a/games/lmpc/lmpc.SlackBuild +++ b/games/lmpc/lmpc.SlackBuild @@ -23,6 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20211022 bkw: BUILD=2 +# - fix -current build (udemy.h) +# - get rid of PDF docs. Sorry, but I don't love tex enough to debug +# whatever's broken them on -current. Read the HTML docs instead. +# - remove useless INSTALL from docdir. +# - rearrange docs slightly, simplify copying them. + # 20200416 bkw: # - take over maintenance # - TODO: find out what repo "1b70022" came from. It's newer than @@ -36,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lmpc VERSION=${VERSION:-1b70022} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -48,9 +55,6 @@ if [ -z "$ARCH" ]; then 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -91,6 +95,22 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr --bindir=/usr/games +# 20211022 bkw: the PDF docs fail to build with -current's texlive. +# I didn't figure out how to fix it after an hour, so I punt instead. +# Upstream didn't give us a way to disable building the PDFs, so dike +# it out. We still make the HTML docs; I don't think anyone's going to +# care too much. If you do care, fix it and send me a patch (or live +# with it; don't ask me to fix this for you). +sed -i '/^DEFAULT_TARGET_document/s,\,html,' \ + spec/Makefile \ + spec/*/Makefile \ + doc/Makefile \ + +# 20211022 bkw: for some reason, this file doesn't get built before +# the targets that need it. Wasn't a problem in 14.2's make. *Shrug*. +make -C src -j1 udemy.h + +# 20211022 bkw: We still need the -j1, sorry. make -j1 make install-strip DESTDIR=$PKG @@ -98,43 +118,28 @@ make install-strip DESTDIR=$PKG install -m755 bin/dema $PKG/usr/games/dema install -m755 bin/dm2cat $PKG/usr/games/dm2cat -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING COPYING.LIB INSTALL README.base $PKG/usr/doc/$PRGNAM-$VERSION +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a COPYING COPYING.LIB README.base $PKGDOC -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/doc -cp -a doc/lmpc.html doc/lmpc.pdf $PKG/usr/doc/$PRGNAM-$VERSION/doc +mkdir -p $PKGDOC/spec/misc +cp -a doc/lmpc.html $PKGDOC -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/spec -cp -a \ - spec/dem-q1/dem.html \ - spec/dem-q1/dem.pdf \ - spec/dm2-q2/dm2.html \ - spec/dm2-q2/dm2.pdf \ - spec/dmo-dn/dmo.html \ - spec/dmo-dn/dmo.pdf \ - spec/faq/faq.html \ - spec/faq/faq.pdf \ - spec/lmp-d1/lmp.html \ - spec/lmp-d1/lmp.pdf \ - spec/qwd-qw/qwd.html \ - spec/qwd-qw/qwd.pdf \ - $PKG/usr/doc/$PRGNAM-$VERSION/spec +# These are useless. +rm -f spec/*/index*.html spec/misc/*.{txt,in} -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/misc -cp -a spec/misc/cd.dem \ - spec/misc/cd.html \ - spec/misc/cd.txt \ - spec/misc/ers \ - spec/misc/ers.html \ - spec/misc/mulder \ - spec/misc/mulder.html \ - spec/misc/procdm2.* \ - spec/misc/qfont.dem \ - spec/misc/qfont.html \ - spec/misc/qfont.pcx \ - $PKG/usr/doc/$PRGNAM-$VERSION/misc +# Skip misc/ and main/ here. +cp -a spec/[^m]*/*.html $PKGDOC/spec -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# No executable scripts in doc dir, please. +chmod -x spec/misc/* + +# This list of files was chosen by the previous maintainer. He +# also had cd.txt, which looks like an error (none of the other .txt +# files were copied). +cp -a spec/misc/{cd.,ers,mulder,procdm2.,qfont.}* $PKGDOC/spec/misc + +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/games/lmpc/lmpc.info b/games/lmpc/lmpc.info index f720018dbb..d5014ea5dd 100644 --- a/games/lmpc/lmpc.info +++ b/games/lmpc/lmpc.info @@ -1,7 +1,7 @@ PRGNAM="lmpc" VERSION="1b70022" HOMEPAGE="http://demospecs.half-empty.de/lmpc-alpha/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/lmpc-1b70022.tar.xz" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lmpc-1b70022.tar.xz" MD5SUM="88da9b536615a558fa8c7e91a1c834a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/games/lmpc/slack-desc b/games/lmpc/slack-desc index 504bda208c..86a6d736fb 100644 --- a/games/lmpc/slack-desc +++ b/games/lmpc/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| lmpc: lmpc (The Little Movie Processing Centre) lmpc: -lmpc: LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and Strife -lmpc: LMP files; Duke Nukem 3D and Redneck Rampage DMO files; Quake DEM -lmpc: QuakeWorld QWD files; and Quake II Arena DM3 files. The DEM file -lmpc: cutter tool (demcut), The DEM Text File Analyser (dema), the -lmpc: Broadcasting Server (dbs) and the DM2 file concatenator (dm2cat) are +lmpc: LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and +lmpc: Strife LMP files; Duke Nukem 3D and Redneck Rampage DMO files; +lmpc: Quake DEM QuakeWorld QWD files; and Quake II Arena DM3 files. The +lmpc: DEM file cutter tool (demcut), the DEM Text File Analyser (dema), the +lmpc: Broadcasting Server (dbs), and the DM2 file concatenator (dm2cat) are lmpc: part of this package too. lmpc: -lmpc: http://demospecs.half-empty.de/lmpc-alpha/ +lmpc: lmpc: