diff --git a/xfig-3.2.7-0.build.sh b/xfig-3.2.7-1.build.sh similarity index 72% rename from xfig-3.2.7-0.build.sh rename to xfig-3.2.7-1.build.sh index 4875362..279bebb 100755 --- a/xfig-3.2.7-0.build.sh +++ b/xfig-3.2.7-1.build.sh @@ -1,16 +1,17 @@ #! /bin/bash PKG=xfig -VERSION=3.2.7 -BUILD=0 +VERSION=3.2.7a +FSVERSION=3.2.7 # no silly 'a' in the filesystem +BUILD=1 -PREFIX=/pkg/$PKG-$VERSION-$BUILD -if [ -n "$TESTING" ]; then PREFIX=/dev/shm/$PKG-$VERSION-$BUILD ; fi +PREFIX=/pkg/$PKG-$FSVERSION-$BUILD +if [ -n "$TESTING" ]; then PREFIX=/dev/shm/$PKG-$FSVERSION-$BUILD ; fi set -xe umask 022 -BUILD_TMPDIR=/dev/shm/$PKG-$VERSION-$BUILD.build.tmp +BUILD_TMPDIR=/dev/shm/$PKG-$FSVERSION-$BUILD.build.tmp test -d $BUILD_TMPDIR && ( chmod -R u+rwx $BUILD_TMPDIR || true ; rm -rf $BUILD_TMPDIR ) mkdir -p $BUILD_TMPDIR/home export TMPDIR=$BUILD_TMPDIR @@ -21,6 +22,8 @@ exec $PREFIX/profile <<-EOF PATH=$PREFIX/bin:\$PATH + PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig\${PKG_CONFIG_PATH:+:\$PKG_CONFIG_PATH} + export PKG_CONFIG_PATH if [ -d $PREFIX/.compatlibs ]; then export LD_LIBRARY_PATH=$PREFIX/.compatlibs\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} ; fi EOF . $PREFIX/profile @@ -33,9 +36,9 @@ mkdir -p $BUILDDIR cd $BUILDDIR ( - NPBMVERSION=10.73.28 - test -e netpbm-${NPBMVERSION}.tar.gz || wget https://sourceforge.net/projects/netpbm/files/latest/download -O netpbm-${NPBMVERSION}.tar.gz - test -d netpbm-${NPBMVERSION} || tar xvf netpbm-${NPBMVERSION}.tar.gz + NPBMVERSION=10.73.29 + test -e netpbm-${NPBMVERSION}.tgz || wget --no-verbose https://sourceforge.net/projects/netpbm/files/super_stable/${NPBMVERSION}/netpbm-${NPBMVERSION}.tgz + test -d netpbm-${NPBMVERSION} || tar -xf netpbm-${NPBMVERSION}.tgz cd netpbm-${NPBMVERSION} cat config.mk.in - <<- EOF > config.mk DEFAULT_TARGET = nonmerge @@ -88,9 +91,9 @@ EOF ) ( - test -e xfig-${VERSION}.tar.xz || wget http://downloads.sourceforge.net/mcj/xfig-full-${VERSION}a.tar.xz -O xfig-${VERSION}.tar.xz - test -d xfig-${VERSION}a || tar xvf xfig-${VERSION}.tar.xz - cd xfig-${VERSION}a + test -e xfig-full-${VERSION}.tar.xz || wget --no-verbose https://downloads.sourceforge.net/mcj/xfig-full-${VERSION}.tar.xz + test -d xfig-${VERSION} || tar -xf xfig-full-${VERSION}.tar.xz + cd xfig-${VERSION} ./configure \ --prefix=$PREFIX make @@ -101,7 +104,7 @@ EOF mv xfig xfig.app cat <<- EOF > xfig #! /bin/bash - XAPPLRESDIR=\${XAPPLRESDIR:-$PREFIX/share/X11/app-defaults} \ + XAPPLRESDIR=\${XAPPLRESDIR:-$PREFIX/share/X11/app-defaults} \\ exec $PREFIX/bin/xfig.app "\$@" EOF chmod 755 xfig @@ -109,9 +112,8 @@ EOF ) ( - cd fig2dev-${VERSION}a - ./configure \ - --prefix=$PREFIX + cd fig2dev-${VERSION} + ./configure --enable-transfig --prefix=$PREFIX make make install )