diff options
author | Cody P Schafer | 2020-10-01 23:16:12 -0400 |
---|---|---|
committer | Cody P Schafer | 2020-10-06 00:01:09 -0400 |
commit | b9c4cdb23f663f6f3827a525bdcd714b6b678d89 (patch) | |
tree | a70d4dd3ad37291623a9f604a9e6cf687531df6f | |
parent | 34ad154188a24dfa48acd62793dc5798f36e1a24 (diff) | |
download | aur-b9c4cdb23f663f6f3827a525bdcd714b6b678d89.tar.gz |
use debian p14 as the basis
-rwxr-xr-x | .SRCINFO | 27 | ||||
-rwxr-xr-x | .gitignore | 6 | ||||
-rwxr-xr-x | Makefile-install.patch | 70 | ||||
-rwxr-xr-x | PKGBUILD | 114 | ||||
-rwxr-xr-x | hfsutils-3.2.6-errno.patch | 13 | ||||
-rwxr-xr-x | hfsutils-3.2.6-fix-tcl-8.6.patch | 8 | ||||
-rwxr-xr-x | largerthan2gb.patch | 15 |
7 files changed, 40 insertions, 213 deletions
@@ -1,24 +1,15 @@ pkgbase = hfsutils - pkgdesc = A comprehensive software to permit manipulation of HFS volumes - pkgver = 3.2.6 - pkgrel = 11 - url = http://www.mars.org/home/rob/proj/hfs/ - arch = i686 + pkgdesc = HFS Access utils + pkgver = 3.2.6_p14 + pkgrel = 1 + url = https://www.mars.org/home/rob/proj/hfs/ arch = x86_64 - license = GPL + license = GPL2 depends = glibc - optdepends = tcl: For the graphical interface [rebuild using --with-tcl] - optdepends = tk: For the graphical interface [rebuild using --with-tk] - source = ftp://ftp.mars.org/pub/hfs/hfsutils-3.2.6.tar.gz - source = Makefile-install.patch - source = hfsutils-3.2.6-errno.patch - source = largerthan2gb.patch - source = hfsutils-3.2.6-fix-tcl-8.6.patch - md5sums = fa572afd6da969e25c1455f728750ec4 - md5sums = af48f3ff82c6aa8607c10271c2e56c77 - md5sums = 4f5ea10416823de9fd38f6121dd3b8f0 - md5sums = 7ab54a275889301df989c4a0351781c6 - md5sums = a4b7920d3302f4c79f162923d8c1c654 + source = https://deb.debian.org/debian/pool/main/h/hfsutils/hfsutils_3.2.6.orig.tar.gz + source = https://deb.debian.org/debian/pool/main/h/hfsutils/hfsutils_3.2.6-14.debian.tar.xz + sha256sums = bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840 + sha256sums = 855cbdad4fead0e3e37a994d4a2b82f872eda4fe5ed7703d9a3e1de398dbc7ac pkgname = hfsutils diff --git a/.gitignore b/.gitignore index 7d813751c966..b39593800d1e 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +<<<<<<< HEAD src srcdir pkg @@ -9,3 +10,8 @@ pkgdir *.tar *.zip *.rar +======= +*.tar.* +pkg/ +src/ +>>>>>>> c7bac17... init diff --git a/Makefile-install.patch b/Makefile-install.patch deleted file mode 100755 index 38a123a98125..000000000000 --- a/Makefile-install.patch +++ /dev/null @@ -1,70 +0,0 @@ -*** Makefile.in.orig 2013-05-05 16:48:26.065525171 +0100 ---- Makefile.in 2013-05-05 16:53:14.065321352 +0100 -*************** INCDEST = @includedir@ -*** 36,42 **** - - MANEXT = 1 - -! INSTALL = @INSTALL@ - BININSTALL = @INSTALL_PROGRAM@ -m 755 - LIBINSTALL = @INSTALL_DATA@ - HARDLINK = ln -f ---- 36,42 ---- - - MANEXT = 1 - -! INSTALL = @INSTALL@ -D - BININSTALL = @INSTALL_PROGRAM@ -m 755 - LIBINSTALL = @INSTALL_DATA@ - HARDLINK = ln -f -*************** check :: all -*** 111,117 **** - install :: @INSTALL_TARGETS@ - - install_cli :: all_cli -! $(BININSTALL) $(HFSUTIL) "$(BINDEST)/." - - for file in $(CLITARGETS); do \ - $(HARDLINK) "$(BINDEST)/$(HFSUTIL)" "$(BINDEST)/$$file"; \ ---- 111,117 ---- - install :: @INSTALL_TARGETS@ - - install_cli :: all_cli -! $(BININSTALL) $(HFSUTIL) "$(BINDEST)/$(HFSUTIL)" - - for file in $(CLITARGETS); do \ - $(HARDLINK) "$(BINDEST)/$(HFSUTIL)" "$(BINDEST)/$$file"; \ -*************** install_cli :: all_cli -*** 126,132 **** - - install_tcl :: all_tcl - for file in $(TCLTARGETS); do \ -! $(BININSTALL) $$file "$(BINDEST)/."; \ - done - - if [ -f "$(BINDEST)/hfs" ]; then \ ---- 126,132 ---- - - install_tcl :: all_tcl - for file in $(TCLTARGETS); do \ -! $(BININSTALL) $$file "$(BINDEST)/$$file"; \ - done - - if [ -f "$(BINDEST)/hfs" ]; then \ -*************** install_tcl :: all_tcl -*** 142,148 **** - - install_tk :: all_tk - for file in $(TKTARGETS); do \ -! $(BININSTALL) $$file "$(BINDEST)/."; \ - done - - for file in $(TKDOCS); do \ ---- 142,148 ---- - - install_tk :: all_tk - for file in $(TKTARGETS); do \ -! $(BININSTALL) $$file "$(BINDEST)/$(TKTARGETS)"; \ - done - - for file in $(TKDOCS); do \ @@ -1,99 +1,35 @@ -# Maintainer: Pablo Lezaeta <prflr88@gmail.com> - pkgname=hfsutils -pkgver=3.2.6 -pkgrel=11 -pkgdesc="A comprehensive software to permit manipulation of HFS volumes" -arch=("i686" "x86_64") -url="http://www.mars.org/home/rob/proj/hfs/" -license=("GPL") -depends=("glibc") -optdepends=("tcl: For the graphical interface [rebuild using --with-tcl]" - "tk: For the graphical interface [rebuild using --with-tk]") -source=("ftp://ftp.mars.org/pub/hfs/$pkgname-$pkgver.tar.gz" - "Makefile-install.patch" - "hfsutils-3.2.6-errno.patch" - "largerthan2gb.patch" - "hfsutils-3.2.6-fix-tcl-8.6.patch") +pkgver=3.2.6_p14 +pkgrel=1 +pkgdesc="HFS Access utils" +arch=('x86_64') +license=('GPL2') +url="https://www.mars.org/home/rob/proj/hfs/" +depends=(glibc) +source=( + "https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver/_p*}.orig.tar.gz" + "https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver/_p/-}.debian.tar.xz" + ) +sha256sums=('bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840' + '855cbdad4fead0e3e37a994d4a2b82f872eda4fe5ed7703d9a3e1de398dbc7ac') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fixed Makefile @INSTALL@ path - patch -Np0 -i "${srcdir}/Makefile-install.patch" - - # Fix the errno issue on glibc-2.3.2+ - patch -Np1 -i "${srcdir}/hfsutils-3.2.6-errno.patch" - - # Add support for files larger than 2 GB, like any dvd image - patch -Np1 -i "${srcdir}/largerthan2gb.patch" - - # Fixed compilation with tcl-8.6+ - patch -Np1 -i "${srcdir}/hfsutils-3.2.6-fix-tcl-8.6.patch" + for file in $(cat ./debian/patches/series); do + patch -Np1 -d ${pkgname}-${pkgver%_p*} <"debian/patches/$file" + done } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Upstream bug, need patch, not build with default cppflags - unset CPPFLAGS CFLAGS - - ./configure --prefix="${pkgdir}/usr" \ - --sbindir="/usr/bin" \ - --bindir="/usr/bin" \ - --mandir="/usr/share/man" \ - --without-tcl --without-tk - - make prefix="${pkgdir}/usr" \ - MANDEST="${pkgdir}/usr/share/man" \ - DESTDIR="${pkgdir}/usr" \ - BINDEST="${pkgdir}/usr/bin" \ - SBINDEST="${pkgdir}/usr/bin" - - # change the without to with to add tcl and/or tk support - - cd "${srcdir}/${pkgname}-${pkgver}/hfsck" - make prefix="${pkgdir}/usr" \ - MANDEST="${pkgdir}/usr/share/man" \ - DESTDIR="${pkgdir}/usr" \ - BINDEST="${pkgdir}/usr/bin" \ - SBINDEST="${pkgdir}/usr/bin" + cd "${pkgname}-${pkgver%_p*}" + autoreconf -fi + ./configure + make prefix=/usr + make -C hfsck prefix=/usr } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# # Check ALLWAYS fail -# make -k check -#} - package() { - cd "${srcdir}/${pkgname}-${pkgver}" - msg "Installing to ${pkgdir}" - - make prefix="${pkgdir}/usr" \ - MANDEST="${pkgdir}/usr/share/man" \ - DESTDIR="${pkgdir}/usr" \ - BINDEST="${pkgdir}/usr/bin" \ - SBINDEST="${pkgdir}/usr/bin" \ - install - - # Faulty makefile, install hfsck - install -m 755 "${srcdir}/${pkgname}-${pkgver}/hfsck/hfsck" \ - "${pkgdir}/usr/bin/hfsck" - - # Standard linux toolset - cd "${pkgdir}/usr/bin" - ln -f "hfsck" "fsck.hfs" - ln -f "hformat" "mkfs.hfs" - - # Toolset for standard linux manpages - cd "${pkgdir}/usr/share/man/man1/" - # ln -f "hfsck.1" "fsck.hfs.1" # there no manpage for hfsck - ln -f "hformat.1" "mkfs.hfs.1" + cd "${pkgname}-${pkgver%_p*}" + install -d -m755 "${pkgdir}/usr/bin" + install -d -m755 "${pkgdir}/usr/share/man/man1" + DESTDIR="${pkgdir}" make install prefix="${pkgdir}/usr" MANDEST="${pkgdir}/usr/share/man" } - -md5sums=('fa572afd6da969e25c1455f728750ec4' - 'af48f3ff82c6aa8607c10271c2e56c77' - '4f5ea10416823de9fd38f6121dd3b8f0' - '7ab54a275889301df989c4a0351781c6' - 'a4b7920d3302f4c79f162923d8c1c654') diff --git a/hfsutils-3.2.6-errno.patch b/hfsutils-3.2.6-errno.patch deleted file mode 100755 index 6e25f794b220..000000000000 --- a/hfsutils-3.2.6-errno.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN hfsutils.orig/tclhfs.c hfsutils-3.2.6/tclhfs.c ---- hfsutils.orig/tclhfs.c 2003-03-31 17:34:55.000000000 +0200 -+++ hfsutils-3.2.6/tclhfs.c 2003-03-31 17:39:51.000000000 +0200 -@@ -43,8 +43,7 @@ - # include "charset.h" - # include "suid.h" - # include "version.h" -- --extern int errno; -+# include <errno.h> - - # define ERROR(code, str) (hfs_error = (str), errno = (code)) - diff --git a/hfsutils-3.2.6-fix-tcl-8.6.patch b/hfsutils-3.2.6-fix-tcl-8.6.patch deleted file mode 100755 index 19f15424543c..000000000000 --- a/hfsutils-3.2.6-fix-tcl-8.6.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- hfsutils-3.2.6/config.h.in -+++ hfsutils-3.2.6/config.h.in -@@ -91,3 +91,5 @@ - # ifndef HAVE_STRTOL - long strtol(const char *, char **, int); - # endif -+ -+#define USE_INTERP_RESULT 1 diff --git a/largerthan2gb.patch b/largerthan2gb.patch deleted file mode 100755 index 423256b67d4f..000000000000 --- a/largerthan2gb.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN hfsutils.orig/libhfs/os/unix.c hfsutils-3.2.6/libhfs/os/unix.c ---- hfsutils.orig/libhfs/os/unix.c 1998-11-02 23:09:13.000000000 +0000 -+++ hfsutils-3.2.6/libhfs/os/unix.c 2007-02-27 15:44:21.023442553 +0000 -@@ -19,6 +19,11 @@ - * $Id: largerthan2gb.patch,v 1.1 2005/02/05 21:20:43 hansmi Exp $ - */ - -+#ifdef __linux__ -+#define _FILE_OFFSET_BITS 64 -+#define _LARGE_FILES -+#endif -+ - # ifdef HAVE_CONFIG_H - # include "config.h" - # endif |