9 files changed, 76 insertions, 552 deletions

diff --git a/archivers/unadf/Makefile b/archivers/unadf/Makefile
index 41d4b8206104..3f5870770cc6 100644
--- a/archivers/unadf/Makefile
+++ b/archivers/unadf/Makefile
@@ -6,40 +6,62 @@
 #
 
 PORTNAME=	unadf
-PORTVERSION=	0.7.9b
-PORTREVISION=	2
+PORTVERSION=	0.7.12
 CATEGORIES=	archivers
-MASTER_SITES=	http://perso.club-internet.fr/lclevy/adflib/
-DISTNAME=	adflib
+MASTER_SITES=	http://lclevy.free.fr/adflib/
+DISTNAME=	adflib-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	uffe@uffe.org
 COMMENT=	Extracts files from .adf-files used by Amiga emulators
 
-DEPRECATED=	Looks like an abandonware, no more public distfile
-EXPIRATION_DATE=	2011-08-01
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_BZIP2=	yes
 
-NO_WRKSUBDIR=	yes
-PLIST_FILES=	bin/unadf
-PORTDOCS=	API.txt api_device.html api_dir.html api_env.html api_file.html \
-		api_index.html api_native.html api_salv.html api_volume.html
-USE_ZIP=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e "s@tests lib demo@lib demo@g" ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} 's|CFLAGS=-I$$(LIBDIR) -O2 -Wall -Wno-uninitialized -pedantic|CFLAGS+= -I$$(LIBDIR)|' \
-			${WRKSRC}/Demo/Makefile
-	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS+=|' \
-			-e 's|-Wall -O2 -pedantic||' \
-			-e 's|CC=|CC?=|' \
-			${WRKSRC}/Lib/Makefile
+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
+
+#
+# args below adapted from adflib: autogen.sh
+#
+LIBTOOLIZE_ARGS=--copy --force
+AUTOMAKE_ARGS=	--add-missing
+
+#
+# ports/aclocal workaround:
+#
+# aclocal only scans version-specific dir: ${LOCALBASE}/share/aclocal-<version>/
+# hence aclocal does not find 3rd party m4 files (libtool.m4 etc)
+# http://www.freebsd.org/cgi/query-pr.cgi?ports/98435
+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+
+PLIST_FILES=	bin/unadf
+
+DOCS=		API.txt api_device.html api_dir.html api_env.html api_file.html \
+		api_index.html api_native.html api_salv.html api_volume.html version0.7.9d_gary.txt
+
+FAQS=		FAQ/adf_info.html FAQ/adf_info.txt FAQ/adf_info_V0_9.txt
+
+FAQSIMGS=	FAQ/image/adf_dir.gif FAQ/image/adf_file.gif
+
+PORTDOCS=	*
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Demo/unadf ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/unadf ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/Docs/${i} ${DOCSDIR}
+.for i in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.endfor
+	${MKDIR} ${DOCSDIR}/FAQ
+.for i in ${FAQS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/FAQ
+.endfor
+	${MKDIR} ${DOCSDIR}/FAQ/image
+.for i in ${FAQSIMGS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/FAQ/image
 .endfor
 .endif
 
diff --git a/archivers/unadf/distinfo b/archivers/unadf/distinfo
index dca4e9efbe4e..4b3f3e6a27a8 100644
--- a/archivers/unadf/distinfo
+++ b/archivers/unadf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (adflib.zip) = d78dbc554e6bf0465ad3cf075968f5479b2a983fc1f29b482500b9f9eebb42df
-SIZE (adflib.zip) = 254914
+SHA256 (adflib-0.7.12.tar.bz2) = 41c4d0bd369f789a615118b9206905fcd07241d486cda6dece71384dbb42a1bb
+SIZE (adflib-0.7.12.tar.bz2) = 135412
diff --git a/archivers/unadf/files/patch-DemoMakefile b/archivers/unadf/files/patch-DemoMakefile
deleted file mode 100644
index 58d6d2396fa1..000000000000
--- a/archivers/unadf/files/patch-DemoMakefile
+++ /dev/null
@@ -1,91 +0,0 @@
---- Demo/Makefile	Fri Aug 18 20:08:14 2000
-+++ Demo/Makefile.new	Fri Oct 27 20:46:41 2000
-@@ -32,19 +32,14 @@
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
--unadf.o: /usr/include/stdlib.h
- # /usr/include/stdlib.h includes:
- #	features.h
- #	stddef.h
- #	sys/types.h
- #	alloca.h
--unadf.o: /usr/include/features.h
- # /usr/include/features.h includes:
- #	sys/cdefs.h
- #	gnu/stubs.h
--unadf.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--unadf.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--unadf.o: /usr/include/sys/types.h
- # /usr/include/sys/types.h includes:
- #	features.h
- #	bits/types.h
-@@ -53,54 +48,41 @@
- #	endian.h
- #	sys/select.h
- #	sys/sysmacros.h
--unadf.o: /usr/include/bits/types.h
- # /usr/include/bits/types.h includes:
- #	features.h
- #	stddef.h
--unadf.o: /usr/include/time.h
- # /usr/include/time.h includes:
- #	bits/types.h
--unadf.o: /usr/include/endian.h
- # /usr/include/endian.h includes:
- #	features.h
- #	bits/endian.h
--unadf.o: /usr/include/bits/endian.h /usr/include/sys/select.h
- # /usr/include/sys/select.h includes:
- #	features.h
- #	bits/types.h
- #	bits/select.h
- #	bits/sigset.h
- #	time.h
--unadf.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--unadf.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
- # /usr/include/alloca.h includes:
- #	features.h
- #	stddef.h
--unadf.o: /usr/include/errno.h
- # /usr/include/errno.h includes:
- #	features.h
- #	bits/errno.h
--unadf.o: /usr/include/bits/errno.h
- # /usr/include/bits/errno.h includes:
- #	linux/errno.h
--unadf.o: /usr/include/linux/errno.h
- # /usr/include/linux/errno.h includes:
- #	asm/errno.h
--unadf.o: /usr/include/asm/errno.h /usr/include/string.h
- # /usr/include/string.h includes:
- #	features.h
- #	stddef.h
--unadf.o: ../Lib/adflib.h
- # ../Lib/adflib.h includes:
- #	adf_defs.h
- #	adf_str.h
--unadf.o: ../Lib/adf_defs.h ../Lib/adf_str.h
- # ../Lib/adf_str.h includes:
- #	stdio.h
- #	adf_defs.h
- #	adf_blk.h
- #	adf_err.h
--unadf.o: /usr/include/stdio.h
- # /usr/include/stdio.h includes:
- #	features.h
- #	stddef.h
-@@ -108,13 +90,9 @@
- #	bits/types.h
- #	libio.h
- #	bits/stdio_lim.h
--unadf.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--unadf.o: /usr/include/libio.h
- # /usr/include/libio.h includes:
- #	_G_config.h
- #	stdarg.h
--unadf.o: /usr/include/_G_config.h
- # /usr/include/_G_config.h includes:
- #	bits/types.h
- #	stddef.h
--unadf.o: /usr/include/bits/stdio_lim.h ../Lib/adf_blk.h ../Lib/adf_err.h
diff --git a/archivers/unadf/files/patch-Lib::myconf b/archivers/unadf/files/patch-Lib::myconf
deleted file mode 100644
index 69365eb3978a..000000000000
--- a/archivers/unadf/files/patch-Lib::myconf
+++ /dev/null
@@ -1,28 +0,0 @@
---- Lib/myconf.orig	2000-08-19 03:08:08.000000000 +0200
-+++ Lib/myconf	2011-07-05 11:45:16.000000000 +0200
-@@ -28,20 +28,20 @@
- 
- END
- 
--gcc myctest.c -o myctest
-+$CC myctest.c -o myctest
- rm myctest.c
- 
--if [ `myctest |cut -d' ' -f 1` != 4 ]
-+if [ `./myctest |cut -d' ' -f 1` != 4 ]
-     then echo "Error : sizeof(long)!=4"
- fi
--if [ `myctest |cut -d' ' -f 2` != 2 ]
-+if [ `./myctest |cut -d' ' -f 2` != 2 ]
-     then echo "Error : sizeof(short)!=2"
- fi
--if [ `myctest |cut -d' ' -f 3` != 4 ]
-+if [ `./myctest |cut -d' ' -f 3` != 4 ]
-     then echo "Error  :sizeof(int)!=4"
- fi
- 
--if [ `myctest |cut -d' ' -f 4` = LITTLE ]
-+if [ `./myctest |cut -d' ' -f 4` = LITTLE ]
-     then 
-     echo "#ifndef LITT_ENDIAN" >defendian.h
-     echo "#define LITT_ENDIAN 1" >>defendian.h 
diff --git a/archivers/unadf/files/patch-LibMakefile b/archivers/unadf/files/patch-LibMakefile
deleted file mode 100644
index c28db5654b7b..000000000000
--- a/archivers/unadf/files/patch-LibMakefile
+++ /dev/null
@@ -1,407 +0,0 @@
---- Lib/Makefile	Fri Oct 27 20:39:11 2000
-+++ Lib/Makefile.new	Fri Oct 27 20:44:32 2000
-@@ -27,7 +27,7 @@
-         adf_util.o adf_env.o adf_nativ.o adf_dir.o adf_file.o adf_cache.o \
-         adf_link.o adf_salv.o
- 
--libadf.a: $(OBJS)
-+libadf.a: defendian.h $(OBJS)
- 	$(AR) $@ $(OBJS)
- 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
- 
-@@ -41,7 +41,7 @@
- # to define LITT_ENDIAN on little endian machines (intel)
- # checks for sizeof(long)=4, sizeof(short)=2, sizeof(int)=4
- defendian.h: myconf 
--	myconf
-+	./myconf
- 
- adf_nativ.o: ${NATIV_DIR}/adf_nativ.c ${NATIV_DIR}/adf_nativ.h
- 	$(CC) ${CFLAGS} -c ${NATIV_DIR}/adf_nativ.c
-@@ -59,19 +59,14 @@
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
--adf_bitm.o: /usr/include/stdlib.h
- # /usr/include/stdlib.h includes:
- #	features.h
- #	stddef.h
- #	sys/types.h
- #	alloca.h
--adf_bitm.o: /usr/include/features.h
- # /usr/include/features.h includes:
- #	sys/cdefs.h
- #	gnu/stubs.h
--adf_bitm.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_bitm.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_bitm.o: /usr/include/sys/types.h
- # /usr/include/sys/types.h includes:
- #	features.h
- #	bits/types.h
-@@ -80,46 +75,35 @@
- #	endian.h
- #	sys/select.h
- #	sys/sysmacros.h
--adf_bitm.o: /usr/include/bits/types.h
- # /usr/include/bits/types.h includes:
- #	features.h
- #	stddef.h
--adf_bitm.o: /usr/include/time.h
- # /usr/include/time.h includes:
- #	bits/types.h
--adf_bitm.o: /usr/include/endian.h
- # /usr/include/endian.h includes:
- #	features.h
- #	bits/endian.h
--adf_bitm.o: /usr/include/bits/endian.h /usr/include/sys/select.h
- # /usr/include/sys/select.h includes:
- #	features.h
- #	bits/types.h
- #	bits/select.h
- #	bits/sigset.h
- #	time.h
--adf_bitm.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_bitm.o: /usr/include/sys/sysmacros.h
- # /usr/include/sys/sysmacros.h includes:
- #	endian.h
--adf_bitm.o: /usr/include/alloca.h
- # /usr/include/alloca.h includes:
- #	features.h
- #	stddef.h
--adf_bitm.o: /usr/include/string.h
- # /usr/include/string.h includes:
- #	features.h
- #	stddef.h
--adf_bitm.o: adf_raw.h
- # adf_raw.h includes:
- #	adf_str.h
--adf_bitm.o: adf_str.h
- # adf_str.h includes:
- #	stdio.h
- #	adf_defs.h
- #	adf_blk.h
- #	adf_err.h
--adf_bitm.o: /usr/include/stdio.h
- # /usr/include/stdio.h includes:
- #	features.h
- #	stddef.h
-@@ -127,319 +111,66 @@
- #	bits/types.h
- #	libio.h
- #	bits/stdio_lim.h
--adf_bitm.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_bitm.o: /usr/include/libio.h
- # /usr/include/libio.h includes:
- #	_G_config.h
- #	stdarg.h
--adf_bitm.o: /usr/include/_G_config.h
- # /usr/include/_G_config.h includes:
- #	bits/types.h
- #	stddef.h
--adf_bitm.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_bitm.o: adf_bitm.h
- # adf_bitm.h includes:
- #	adf_str.h
- #	prefix.h
--adf_bitm.o: prefix.h adf_disk.h
- # adf_disk.h includes:
- #	prefix.h
- #	adf_str.h
- #	adf_defs.h
--adf_bitm.o: adf_util.h
- # adf_util.h includes:
- #	prefix.h
- #	adf_str.h
--adf_bitm.o: defendian.h
--adf_bitm.o: adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_bitm.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_bitm.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_bitm.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_bitm.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_bitm.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_bitm.o: adf_blk.h adf_err.h prefix.h
--adf_cache.o: /usr/include/stdlib.h /usr/include/features.h
--adf_cache.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_cache.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_cache.o: /usr/include/sys/types.h /usr/include/bits/types.h
--adf_cache.o: /usr/include/time.h /usr/include/endian.h
--adf_cache.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_cache.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_cache.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
--adf_cache.o: /usr/include/string.h adf_defs.h adf_str.h /usr/include/stdio.h
--adf_cache.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_cache.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_cache.o: /usr/include/bits/stdio_lim.h adf_blk.h adf_err.h defendian.h
--adf_cache.o: adf_cache.h
- # adf_cache.h includes:
- #	adf_str.h
--adf_cache.o: adf_raw.h adf_disk.h prefix.h adf_bitm.h adf_util.h adf_dir.h
- # adf_dir.h includes:
- #	adf_str.h
- #	adf_err.h
- #	adf_defs.h
- #	prefix.h
--adf_cache.o: adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_cache.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_cache.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_cache.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_cache.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_cache.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
--adf_cache.o: adf_defs.h adf_blk.h adf_err.h
--adf_dir.o: /usr/include/stdlib.h /usr/include/features.h
--adf_dir.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_dir.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_dir.o: /usr/include/sys/types.h /usr/include/bits/types.h
--adf_dir.o: /usr/include/time.h /usr/include/endian.h
--adf_dir.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_dir.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_dir.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
--adf_dir.o: /usr/include/string.h /usr/include/ctype.h
- # /usr/include/ctype.h includes:
- #	features.h
- #	bits/types.h
- #	endian.h
--adf_dir.o: adf_dir.h adf_str.h /usr/include/stdio.h
--adf_dir.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_dir.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_dir.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_dir.o: prefix.h adf_util.h defendian.h adf_raw.h adf_disk.h adf_bitm.h
--adf_dir.o: adf_file.h
- # adf_file.h includes:
- #	prefix.h
- #	adf_str.h
--adf_dir.o: adf_cache.h
--adf_dir.o: adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_dir.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_dir.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_dir.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_dir.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_dir.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_dir.o: adf_blk.h adf_err.h prefix.h
--adf_disk.o: /usr/include/limits.h
- # /usr/include/limits.h includes:
- #	features.h
- #	bits/posix1_lim.h
- #	bits/posix2_lim.h
- #	limits.h
--adf_disk.o: /usr/include/features.h /usr/include/sys/cdefs.h
--adf_disk.o: /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h
- # /usr/include/bits/posix1_lim.h includes:
- #	bits/local_lim.h
--adf_disk.o: /usr/include/bits/local_lim.h
- # /usr/include/bits/local_lim.h includes:
- #	linux/limits.h
--adf_disk.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h
--adf_disk.o: /usr/include/stdlib.h
--adf_disk.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_disk.o: /usr/include/sys/types.h /usr/include/bits/types.h
--adf_disk.o: /usr/include/time.h /usr/include/endian.h
--adf_disk.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_disk.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_disk.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
--adf_disk.o: /usr/include/string.h adf_str.h /usr/include/stdio.h
--adf_disk.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_disk.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_disk.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_disk.o: adf_disk.h prefix.h adf_raw.h adf_hd.h
- # adf_hd.h includes:
- #	prefix.h
- #	adf_str.h
- #	hd_blk.h
- #	adf_err.h
--adf_disk.o: hd_blk.h
- # hd_blk.h includes:
- #	adf_str.h
--adf_disk.o: adf_bitm.h adf_util.h ./Generic/adf_nativ.h
- # ./Generic/adf_nativ.h includes:
- #	stdio.h
- #	adf_str.h
--adf_disk.o: adf_dump.h adf_cache.h
--adf_disk.o: prefix.h adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_disk.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_disk.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_disk.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_disk.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_disk.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_disk.o: adf_blk.h adf_err.h
--adf_dump.o: /usr/include/stdio.h /usr/include/features.h
--adf_dump.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_dump.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_dump.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_dump.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_dump.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
--adf_dump.o: /usr/include/stdlib.h /usr/include/sys/types.h
--adf_dump.o: /usr/include/time.h /usr/include/endian.h
--adf_dump.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_dump.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_dump.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
--adf_dump.o: /usr/include/errno.h
- # /usr/include/errno.h includes:
- #	features.h
- #	bits/errno.h
--adf_dump.o: /usr/include/bits/errno.h
- # /usr/include/bits/errno.h includes:
- #	linux/errno.h
--adf_dump.o: /usr/include/linux/errno.h
- # /usr/include/linux/errno.h includes:
- #	asm/errno.h
--adf_dump.o: /usr/include/asm/errno.h adf_defs.h adf_str.h adf_blk.h adf_err.h
--adf_dump.o: adf_disk.h prefix.h ./Generic/adf_nativ.h
--adf_env.o: /usr/include/stdio.h /usr/include/features.h
--adf_env.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_env.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_env.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_env.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_env.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
--adf_env.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
--adf_env.o: /usr/include/endian.h /usr/include/bits/endian.h
--adf_env.o: /usr/include/sys/select.h /usr/include/bits/select.h
--adf_env.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
--adf_env.o: /usr/include/alloca.h adf_defs.h adf_str.h adf_blk.h adf_err.h
--adf_env.o: ./Generic/adf_nativ.h adf_env.h
- # adf_env.h includes:
- #	prefix.h
--adf_env.o: prefix.h defendian.h
--adf_env.o: prefix.h
--adf_file.o: /usr/include/stdlib.h /usr/include/features.h
--adf_file.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_file.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_file.o: /usr/include/sys/types.h /usr/include/bits/types.h
--adf_file.o: /usr/include/time.h /usr/include/endian.h
--adf_file.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_file.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_file.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
--adf_file.o: /usr/include/string.h adf_util.h prefix.h adf_str.h
--adf_file.o: /usr/include/stdio.h
--adf_file.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_file.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_file.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_file.o: adf_file.h defendian.h adf_raw.h adf_disk.h adf_dir.h adf_bitm.h
--adf_file.o: adf_cache.h
--adf_file.o: prefix.h adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_file.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_file.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_file.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_file.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_file.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_file.o: adf_blk.h adf_err.h
--adf_hd.o: /usr/include/stdio.h /usr/include/features.h
--adf_hd.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_hd.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_hd.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_hd.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_hd.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
--adf_hd.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
--adf_hd.o: /usr/include/endian.h /usr/include/bits/endian.h
--adf_hd.o: /usr/include/sys/select.h /usr/include/bits/select.h
--adf_hd.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
--adf_hd.o: /usr/include/alloca.h /usr/include/string.h adf_str.h adf_defs.h
--adf_hd.o: adf_blk.h adf_err.h hd_blk.h adf_raw.h adf_hd.h prefix.h adf_util.h
--adf_hd.o: adf_disk.h ./Generic/adf_nativ.h adf_dump.h defendian.h
--adf_hd.o: prefix.h adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_hd.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_hd.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_hd.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_hd.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_hd.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_hd.o: adf_blk.h adf_err.h hd_blk.h
--adf_link.o: /usr/include/string.h /usr/include/features.h
--adf_link.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_link.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_link.o: adf_defs.h adf_str.h /usr/include/stdio.h
--adf_link.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_link.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_link.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_blk.h
--adf_link.o: adf_err.h adf_link.h
- # adf_link.h includes:
- #	prefix.h
--adf_link.o: prefix.h adf_dir.h
--adf_link.o: prefix.h
--adf_raw.o: /usr/include/limits.h /usr/include/features.h
--adf_raw.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_raw.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h
--adf_raw.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h
--adf_raw.o: /usr/include/stdlib.h
--adf_raw.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_raw.o: /usr/include/sys/types.h /usr/include/bits/types.h
--adf_raw.o: /usr/include/time.h /usr/include/endian.h
--adf_raw.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_raw.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_raw.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
--adf_raw.o: /usr/include/string.h adf_str.h /usr/include/stdio.h
--adf_raw.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_raw.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_raw.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_raw.o: adf_raw.h adf_disk.h prefix.h adf_util.h defendian.h
--adf_raw.o: adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_raw.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_raw.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_raw.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_raw.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_raw.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_raw.o: adf_blk.h adf_err.h
--adf_salv.o: /usr/include/string.h /usr/include/features.h
--adf_salv.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_salv.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_salv.o: /usr/include/stdlib.h /usr/include/sys/types.h
--adf_salv.o: /usr/include/bits/types.h /usr/include/time.h
--adf_salv.o: /usr/include/endian.h /usr/include/bits/endian.h
--adf_salv.o: /usr/include/sys/select.h /usr/include/bits/select.h
--adf_salv.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
--adf_salv.o: /usr/include/alloca.h adf_salv.h
- # adf_salv.h includes:
- #	prefix.h
- #	adf_str.h
--adf_salv.o: prefix.h adf_str.h /usr/include/stdio.h
--adf_salv.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_salv.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_salv.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_salv.o: adf_bitm.h adf_util.h adf_disk.h adf_dir.h adf_file.h adf_cache.h
--adf_salv.o: prefix.h adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_salv.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_salv.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_salv.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_salv.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_salv.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_salv.o: adf_blk.h adf_err.h
--adf_str.o: /usr/include/stdio.h /usr/include/features.h
--adf_str.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_str.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_str.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_str.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_str.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_str.o: adf_blk.h adf_err.h
--adf_util.o: /usr/include/stdlib.h /usr/include/features.h
--adf_util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_util.o: /usr/include/sys/types.h /usr/include/bits/types.h
--adf_util.o: /usr/include/time.h /usr/include/endian.h
--adf_util.o: /usr/include/bits/endian.h /usr/include/sys/select.h
--adf_util.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
--adf_util.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h adf_util.h
--adf_util.o: prefix.h adf_str.h /usr/include/stdio.h
--adf_util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_util.o: /usr/include/libio.h /usr/include/_G_config.h
--adf_util.o: /usr/include/bits/stdio_lim.h adf_defs.h adf_blk.h adf_err.h
--adf_util.o: adf_disk.h
--adf_util.o: prefix.h adf_str.h /usr/include/stdio.h /usr/include/features.h
--adf_util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adf_util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adf_util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adf_util.o: /usr/include/bits/types.h /usr/include/libio.h
--adf_util.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--adf_util.o: adf_blk.h adf_err.h
--adflib.o: adf_defs.h adf_str.h /usr/include/stdio.h /usr/include/features.h
--adflib.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--adflib.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--adflib.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--adflib.o: /usr/include/bits/types.h /usr/include/libio.h
--adflib.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_blk.h
--adflib.o: adf_err.h
--hd_blk.o: adf_str.h /usr/include/stdio.h /usr/include/features.h
--hd_blk.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
--hd_blk.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
--hd_blk.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
--hd_blk.o: /usr/include/bits/types.h /usr/include/libio.h
--hd_blk.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h adf_defs.h
--hd_blk.o: adf_blk.h adf_err.h
diff --git a/archivers/unadf/files/patch-Makefile.am b/archivers/unadf/files/patch-Makefile.am
new file mode 100644
index 000000000000..bfe501d68a14
--- /dev/null
+++ b/archivers/unadf/files/patch-Makefile.am
@@ -0,0 +1,8 @@
+--- Makefile.am.orig	2011-06-19 23:17:12.000000000 +0200
++++ Makefile.am	2011-06-19 23:19:03.000000000 +0200
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src doc
+ if EXAMPLES
+ SUBDIRS += examples
+
diff --git a/archivers/unadf/files/patch-configure.ac b/archivers/unadf/files/patch-configure.ac
new file mode 100644
index 000000000000..ced3ca2e6a6c
--- /dev/null
+++ b/archivers/unadf/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2008-03-20 21:10:35.000000000 +0100
++++ configure.ac	2011-06-21 21:42:49.000000000 +0200
+@@ -5,6 +5,7 @@
+ AC_INIT(adflib, 0.7.12, lclevy_AT_club-internet.fr)
+ AC_CONFIG_SRCDIR([src/adf_env.c])
+ AC_CONFIG_HEADER([config.h])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+ 
+ AC_ARG_ENABLE([examples],
+
diff --git a/archivers/unadf/files/patch-examples-Makefile.am b/archivers/unadf/files/patch-examples-Makefile.am
new file mode 100644
index 000000000000..70c5b63fda2b
--- /dev/null
+++ b/archivers/unadf/files/patch-examples-Makefile.am
@@ -0,0 +1,9 @@
+--- examples/Makefile.am.orig	2011-06-21 22:09:04.000000000 +0200
++++ examples/Makefile.am	2011-06-21 22:07:12.000000000 +0200
+@@ -3,4 +3,5 @@
+ unadf_LDADD = $(top_srcdir)/src/libadf.la
+ unadf_DEPENDENCIES = $(top_srcdir)/src/libadf.la
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/$(NATIVE_DIR)
++AM_LDFLAGS = -static-libtool-libs
+ 
+
diff --git a/archivers/unadf/pkg-descr b/archivers/unadf/pkg-descr
index 3c0415d8003b..08f30e71d38c 100644
--- a/archivers/unadf/pkg-descr
+++ b/archivers/unadf/pkg-descr
@@ -1,4 +1,4 @@
 This package includes unadf which extracts files from Amiga .adf
 diskfiles used by Amiga emulators like UAE.
 
-WWW: http://perso.club-internet.fr/lclevy/adflib/unadf.html
+WWW: http://lclevy.free.fr/adflib/unadf.html