diff options
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | debianize.patch | 11 |
3 files changed, 25 insertions, 33 deletions
@@ -1,7 +1,8 @@ pkgbase = dosemu-git pkgdesc = DOS emulator - pkgver = 20130617 + pkgver = 1.4.0.8.180.g35054ba pkgrel = 1 + epoch = 1 url = http://www.dosemu.org/ arch = i686 arch = x86_64 @@ -22,11 +23,13 @@ pkgbase = dosemu-git backup = etc/dosemu/dosemu.conf backup = etc/dosemu/dosemu.users backup = etc/dosemu/global.conf - source = https://dl.dropbox.com/u/13513277/dosemu/dosemu-freedos-1.1-bin.tgz + source = dosemu::git://git.code.sf.net/p/dosemu/code + source = https://dl.dropboxusercontent.com/u/13513277/dosemu/dosemu-freedos-1.1-bin.tgz source = debianize.patch source = xdosemu.desktop - sha256sums = 8f25916dc7f58e71398820b9bc83987cb39e3cd23a7d2d15a7294b2d42cfbed0 - sha256sums = 0a75924d81cde89affe8ea0213fe542cfe6204c45bff5fbaae4f5dd11e3ede2d + sha256sums = SKIP + sha256sums = 0891a8346ee58f8468ab17f93315d6f23fe68348d297be39c1faad5bd6e59613 + sha256sums = 63471aa2c47a52319665c1f3a706d21665edd41df07797c3f558db348b477ba0 sha256sums = ae737e26165c016242d5a8603a5c887c313570e1525091b30f9e8d23d1a9faab pkgname = dosemu-git @@ -7,8 +7,9 @@ # Contributor: Bob Finch <w9ya@arrl.net> pkgname=dosemu-git -pkgver=20130617 +pkgver=1.4.0.8.180.g35054ba pkgrel=1 +epoch=1 pkgdesc="DOS emulator" arch=('i686' 'x86_64') url="http://www.dosemu.org/" @@ -20,40 +21,35 @@ provides=('dosemu') backup=('etc/dosemu/dosemu.conf' 'etc/dosemu/dosemu.users' 'etc/dosemu/global.conf') -source=(https://dl.dropbox.com/u/13513277/dosemu/dosemu-freedos-1.1-bin.tgz +source=('dosemu::git://git.code.sf.net/p/dosemu/code' + https://dl.dropboxusercontent.com/u/13513277/dosemu/dosemu-freedos-1.1-bin.tgz debianize.patch xdosemu.desktop) -sha256sums=('8f25916dc7f58e71398820b9bc83987cb39e3cd23a7d2d15a7294b2d42cfbed0' - '0a75924d81cde89affe8ea0213fe542cfe6204c45bff5fbaae4f5dd11e3ede2d' +sha256sums=('SKIP' + '0891a8346ee58f8468ab17f93315d6f23fe68348d297be39c1faad5bd6e59613' + '63471aa2c47a52319665c1f3a706d21665edd41df07797c3f558db348b477ba0' 'ae737e26165c016242d5a8603a5c887c313570e1525091b30f9e8d23d1a9faab') noextract=('dosemu-freedos-1.1-bin.tgz') -_gitroot=git://git.code.sf.net/p/dosemu/code -_gitname=dosemu +pkgver() { + cd "$srcdir/dosemu" + local ver="$(git describe --long)" + local ver="${ver/dosemu-/}" + echo "${ver//-/.}" +} build() { - cd "$srcdir" - msg "Connecting to GIT server..." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi + cd "$srcdir/dosemu" - msg "SVN checkout done or server timeout" - msg "Starting build..." + patch -p1 -i ../debianize.patch - cd "$srcdir/$_gitname" - patch -p1 < ../debianize.patch sed -ie '/yyget_leng/ s/int/size_t/' src/base/init/lexer.h ./configure --prefix=/usr --with-fdtarball="$srcdir/dosemu-freedos-1.1-bin.tgz" --mandir=/usr/share/man make } package() { - cd "$srcdir/$_gitname" + cd "$srcdir/dosemu" make DESTDIR="$pkgdir" install install -Dm 644 "$srcdir"/xdosemu.desktop "$pkgdir"/usr/share/applications/xdosemu.desktop install -Dm 644 etc/dosemu.xpm "$pkgdir"/usr/share/icons/dosemu.xpm diff --git a/debianize.patch b/debianize.patch index a63db116595e..58970b884070 100644 --- a/debianize.patch +++ b/debianize.patch @@ -1,12 +1,5 @@ -Description: adjust where files are installed, which seems specific to Debian. - Additionally, adjust how the license files are handled, and how they're - mentioned in the copyright notice (i.e. point to the locally installed Debian - copies instead of duplicating them in the binary package). -Author: Kees Cook <kees@debian.org> -Forwarded: not-needed - diff --git a/src/arch/linux/Makefile.main b/src/arch/linux/Makefile.main -index 793c9e2..c25ead3 100644 +index 3fbf825..f122607 100644 --- a/src/arch/linux/Makefile.main +++ b/src/arch/linux/Makefile.main @@ -9,7 +9,7 @@ @@ -16,7 +9,7 @@ index 793c9e2..c25ead3 100644 -dosemudir = $(datadir)/dosemu +dosemudir = $(libdir)/dosemu - NET=dosext/net/net + NET=dosext/net @@ -215,7 +215,6 @@ install: $(INSTALL) -d $(DESTDIR)$(bindir) |