5 files changed, 58 insertions, 77 deletions

diff --git a/archivers/unadf/Makefile b/archivers/unadf/Makefile
index ddb90279c7e1..d10fd713c429 100644
--- a/archivers/unadf/Makefile
+++ b/archivers/unadf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	unadf
 PORTVERSION=	0.7.12
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://lclevy.free.fr/adflib/
 DISTNAME=	adflib-${DISTVERSION}
@@ -12,56 +13,13 @@ COMMENT=	Extracts files from .adf-files used by Amiga emulators
 
 LICENSE=	GPLv2
 
-USES=		tar:bzip2
-
-MAKE_JOBS_UNSAFE=	yes
-
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
-
-#
-# args below adapted from adflib: autogen.sh
-#
-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=	*
+DOCSDIR=	${PREFIX}/share/doc/adflib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/adflib
+INSTALL_TARGET=	install-strip
+USES=		autoreconf libtool pathfix tar:bzip2
+PATHFIX_MAKEFILEIN=	Makefile.am
 
 OPTIONS_DEFINE=	DOCS
 
-# XXX: work around an issue with automake-1.13 erroring out on a
-#      non-existent m4 directory before libtoolize creates it
-pre-configure::
-	@${MKDIR} ${WRKSRC}/m4
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/examples/unadf ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/FAQ
-.for i in ${FAQS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/FAQ
-.endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/FAQ/image
-.for i in ${FAQSIMGS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/FAQ/image
-.endfor
-
 .include <bsd.port.mk>
diff --git a/archivers/unadf/files/patch-Makefile.am b/archivers/unadf/files/patch-Makefile.am
deleted file mode 100644
index bfe501d68a14..000000000000
--- a/archivers/unadf/files/patch-Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index ced3ca2e6a6c..000000000000
--- a/archivers/unadf/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 70c5b63fda2b..000000000000
--- a/archivers/unadf/files/patch-examples-Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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-plist b/archivers/unadf/pkg-plist
new file mode 100644
index 000000000000..f4e42ca43786
--- /dev/null
+++ b/archivers/unadf/pkg-plist
@@ -0,0 +1,51 @@
+bin/unadf
+include/adflib/adf_bitm.h
+include/adflib/adf_blk.h
+include/adflib/adf_cache.h
+include/adflib/adf_defs.h
+include/adflib/adf_dir.h
+include/adflib/adf_disk.h
+include/adflib/adf_dump.h
+include/adflib/adf_env.h
+include/adflib/adf_err.h
+include/adflib/adf_file.h
+include/adflib/adf_hd.h
+include/adflib/adf_link.h
+include/adflib/adf_nativ.h
+include/adflib/adf_raw.h
+include/adflib/adf_salv.h
+include/adflib/adf_str.h
+include/adflib/adf_util.h
+include/adflib/adflib.h
+include/adflib/defendian.h
+include/adflib/hd_blk.h
+include/adflib/prefix.h
+lib/libadf.a
+lib/libadf.so
+lib/libadf.so.0
+lib/libadf.so.0.0.12
+libdata/pkgconfig/adflib.pc
+%%PORTDOCS%%%%DOCSDIR%%/API.txt
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ/adf_info.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ/adf_info.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ/adf_info_V0_9.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ/image/adf_dir.gif
+%%PORTDOCS%%%%DOCSDIR%%/FAQ/image/adf_file.gif
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/api_device.html
+%%PORTDOCS%%%%DOCSDIR%%/api_dir.html
+%%PORTDOCS%%%%DOCSDIR%%/api_env.html
+%%PORTDOCS%%%%DOCSDIR%%/api_file.html
+%%PORTDOCS%%%%DOCSDIR%%/api_index.html
+%%PORTDOCS%%%%DOCSDIR%%/api_native.html
+%%PORTDOCS%%%%DOCSDIR%%/api_salv.html
+%%PORTDOCS%%%%DOCSDIR%%/api_volume.html
+%%PORTDOCS%%%%DOCSDIR%%/version0.7.9d_gary.txt
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/FAQ/image
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/FAQ
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@dirrm include/adflib