- Fix build on 10/head

- Respect CFLAGS, STRIP
- Stage support

PR:		ports/184865
Submitted by:	KATO Tsuguru

3 files changed, 19 insertions, 40 deletions

diff --git a/textproc/amberfish/Makefile b/textproc/amberfish/Makefile
index 5704db125ca1..4389c9392e11 100644
--- a/textproc/amberfish/Makefile
+++ b/textproc/amberfish/Makefile
@@ -7,29 +7,36 @@ CATEGORIES=	textproc databases
 MASTER_SITES=	SF/${PORTNAME}/Amberfish%20source%20-%20stable/${PORTVERSION}	\
 		http://etymon.com/software/amberfish/stable/
 
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose text retrieval Software
 
-LIB_DEPENDS=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2
+LIB_DEPENDS=	libxerces-c.so.27:${PORTSDIR}/textproc/xerces-c2
 
+USES=		gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+ALL_TARGET=	all html
+
+PLIST_FILES=	bin/af man/man1/af.1.gz
+PORTDOCS=	*
 
-MAN1=	af.1
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/porter.cc ${WRKSRC}/src
 
-.if !defined(NOPORTDOCS)
-post-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} html)
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${MAKEFLAGS} ||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|cp |$${BSD_INSTALL_MAN} |' ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-O3 |@CFLAGS@ | ; \
+		s|make strip|| ; \
+		s|cp |$${BSD_INSTALL_PROGRAM} |' ${WRKSRC}/src/Makefile.in
 
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/amberfish.png ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/html/*.html ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/amberfish.png ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/amberfish/files/patch-Makefile.in b/textproc/amberfish/files/patch-Makefile.in
deleted file mode 100644
index 138b01a101d7..000000000000
--- a/textproc/amberfish/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	2008-08-12 11:45:08.000000000 -0500
-+++ src/Makefile.in	2008-08-12 11:46:07.000000000 -0500
-@@ -66,7 +66,7 @@
- 	strip af
- 
- install: all
--	make strip
-+	${MAKE} strip
- 	mkdir -p ${PREFIXBIN}
- 	cp ${BIN} ${PREFIXBIN}/.
- 
diff --git a/textproc/amberfish/pkg-plist b/textproc/amberfish/pkg-plist
deleted file mode 100644
index 0844e358fbf2..000000000000
--- a/textproc/amberfish/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/af
-%%PORTDOCS%%%%DOCSDIR%%/Fields-and-XML.html
-%%PORTDOCS%%%%DOCSDIR%%/Fields.html
-%%PORTDOCS%%%%DOCSDIR%%/Indexing.html
-%%PORTDOCS%%%%DOCSDIR%%/Introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/Listing-database-information.html
-%%PORTDOCS%%%%DOCSDIR%%/More-about-XML.html
-%%PORTDOCS%%%%DOCSDIR%%/Multiple-databases.html
-%%PORTDOCS%%%%DOCSDIR%%/Multiple-documents-in-a-file.html
-%%PORTDOCS%%%%DOCSDIR%%/Phrases.html
-%%PORTDOCS%%%%DOCSDIR%%/Relevance-ranking.html
-%%PORTDOCS%%%%DOCSDIR%%/Right-truncation.html
-%%PORTDOCS%%%%DOCSDIR%%/Searching.html
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/amberfish.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%