- Add USES=libtool

- Replace post-patch command with configure argument
- Replace two patches with post-patch command

4 files changed, 9 insertions, 95 deletions

diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 055021bc7ab8..2de621305b2c 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	oath-toolkit
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -11,8 +11,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Library, tools, and PAM module for OATH authentication
 
-USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
+USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PSKC DOCS
@@ -31,9 +32,9 @@ DOCS=		AUTHORS ChangeLog NEWS README
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} 's|@HTML_DIR@|${DOCSDIR}|' \
-		${WRKSRC}/liboath/gtk-doc/Makefile.in \
-		${WRKSRC}/libpskc/gtk-doc/Makefile.in
+	@${REINPLACE_CMD} '/^Makefile.gdoc:/s,$$(top_builddir)/configure,,' \
+		${WRKSRC}/liboath/man/Makefile.in \
+		${WRKSRC}/libpskc/man/Makefile.in
 
 post-install:
 .for f in ${DOCS}
diff --git a/security/oath-toolkit/files/patch-liboath_man_Makefile.in b/security/oath-toolkit/files/patch-liboath_man_Makefile.in
deleted file mode 100644
index 2e706b43288d..000000000000
--- a/security/oath-toolkit/files/patch-liboath_man_Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- liboath/man/Makefile.in.orig	2013-10-05 13:22:16.000000000 +0000
-+++ liboath/man/Makefile.in	2013-10-05 13:37:05.265332575 +0000
-@@ -1127,31 +1127,7 @@
- 	oath_totp_validate2_callback.3 oath_totp_validate3.3 \
- 	oath_totp_validate3_callback.3 oath_strerror.3 \
- 	oath_strerror_name.3
--all: $(BUILT_SOURCES)
--	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
--.SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign man/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
- $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc:
- 
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-@@ -1256,7 +1232,7 @@
- 	for dir in "$(DESTDIR)$(man3dir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
--install: $(BUILT_SOURCES)
-+install:
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
- install-data: install-data-am
diff --git a/security/oath-toolkit/files/patch-libpskc_man_Makefile.in b/security/oath-toolkit/files/patch-libpskc_man_Makefile.in
deleted file mode 100644
index 6289fe69a68b..000000000000
--- a/security/oath-toolkit/files/patch-libpskc_man_Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- libpskc/man/Makefile.in.orig	2013-10-05 13:22:16.000000000 +0000
-+++ libpskc/man/Makefile.in	2013-10-05 13:36:51.611332967 +0000
-@@ -1243,31 +1243,7 @@
- 	pskc_done.3 pskc_parse_from_memory.3 pskc_validate.3 \
- 	pskc_build_xml.3 pskc_sign_x509.3 pskc_verify_x509crt.3 \
- 	pskc_output.3
--all: $(BUILT_SOURCES)
--	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
--.SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign man/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
- $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc:
- 
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-@@ -1372,7 +1348,7 @@
- 	for dir in "$(DESTDIR)$(man3dir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
--install: $(BUILT_SOURCES)
-+install:
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
- install-data: install-data-am
diff --git a/security/oath-toolkit/pkg-plist b/security/oath-toolkit/pkg-plist
index b88eb6d9f20f..3e5d9d48b963 100644
--- a/security/oath-toolkit/pkg-plist
+++ b/security/oath-toolkit/pkg-plist
@@ -10,14 +10,13 @@ include/liboath/oath.h
 %%PSKC%%include/pskc/pskc.h
 %%PSKC%%include/pskc/version.h
 lib/liboath.a
-lib/liboath.la
 lib/liboath.so
-lib/liboath.so.1
+lib/liboath.so.0
+lib/liboath.so.0.1.3
 %%PSKC%%lib/libpskc.a
-%%PSKC%%lib/libpskc.la
 %%PSKC%%lib/libpskc.so
 %%PSKC%%lib/libpskc.so.0
-lib/security/pam_oath.la
+%%PSKC%%lib/libpskc.so.0.0.1
 lib/security/pam_oath.so
 libdata/pkgconfig/liboath.pc
 %%PSKC%%libdata/pkgconfig/libpskc.pc