diff options
| -rw-r--r-- | system/dosemu/doinst.sh | 6 | ||||
| -rw-r--r-- | system/dosemu/dosemu.SlackBuild | 26 | ||||
| -rw-r--r-- | system/dosemu/dosemu.info | 12 |
3 files changed, 20 insertions, 24 deletions
diff --git a/system/dosemu/doinst.sh b/system/dosemu/doinst.sh index a525f4b87c..00b706bce9 100644 --- a/system/dosemu/doinst.sh +++ b/system/dosemu/doinst.sh @@ -11,7 +11,7 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/dosemu.conf.new -config etc/global.conf.new -config etc/dosemu.users.new +config etc/dosemu/dosemu.conf.new +config etc/dosemu/global.conf.new +config etc/dosemu/dosemu.users.new diff --git a/system/dosemu/dosemu.SlackBuild b/system/dosemu/dosemu.SlackBuild index 6c439772fb..e93b921c0b 100644 --- a/system/dosemu/dosemu.SlackBuild +++ b/system/dosemu/dosemu.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dosemu -VERSION=1.4.0 +VERSION=${VERSION:-20130804_35054ba} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,20 +66,20 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tgz +tar -xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . -chmod -R a-s,u+w,go+r-w . - -# patch to upgrade version to 1.4.0.1 (1.4.1 pre-release) -# http://dosemu.sourceforge.net/prereleases/patch-1.4.0.1.gz -zcat $CWD/patch-1.4.0.1.gz | patch -p1 +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" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/dosemu \ --localstatedir=/var \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-x="$WITH_X" \ @@ -89,20 +89,18 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/dosemu $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rmdir $PKG/usr/share/doc -( cd $PKG/etc +( cd $PKG/etc/dosemu mv dosemu.conf dosemu.conf.new mv dosemu.users dosemu.users.new mv global.conf global.conf.new diff --git a/system/dosemu/dosemu.info b/system/dosemu/dosemu.info index 5ac0dff4a3..55f44a309b 100644 --- a/system/dosemu/dosemu.info +++ b/system/dosemu/dosemu.info @@ -1,12 +1,10 @@ PRGNAM="dosemu" -VERSION="1.4.0" +VERSION="20130804_35054ba" HOMEPAGE="http://www.dosemu.org" -DOWNLOAD="http://downloads.sourceforge.net/dosemu/dosemu-1.4.0.tgz \ - http://downloads.sourceforge.net/dosemu/dosemu-freedos-1.0-bin.tgz \ - http://dosemu.sourceforge.net/prereleases/patch-1.4.0.1.gz" -MD5SUM="0bba530637266f99d404ba15e3f118d4 \ - 2e09774fe91cff4372cb4a393eb467f5 \ - d06b3d56cdcb7f84ed8947d127e7f078" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/dosemu-20130804_35054ba.tar.xz \ + http://downloads.sourceforge.net/dosemu/dosemu-freedos-1.0-bin.tgz" +MD5SUM="190c77107fa23847eaa0bade762091ff \ + 2e09774fe91cff4372cb4a393eb467f5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |