Bug 184865 - textproc/amberfish: Fix build on -current
Summary: textproc/amberfish: Fix build on -current
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Antoine Brodin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2014-01-15 19:50 UTC (History)
0 users

See Also:


Attachments
file.diff (3.08 KB, patch)
2013-12-16 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:18 UTC
- Fix build on -current
- Support CFLAGS properly
- Support STRIP properly
- Support PLIST_FILES

Remove file:
files/patch-Makefile.in
pkg-plist
Comment 1 Antoine Brodin freebsd_committer 2014-01-15 19:05:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->antoine

Take
Comment 2 dfilter service freebsd_committer 2014-01-15 19:36:33 UTC
Author: antoine
Date: Wed Jan 15 19:36:26 2014
New Revision: 339809
URL: http://svnweb.freebsd.org/changeset/ports/339809
QAT: https://qat.redports.org/buildarchive/r339809/

Log:
  - Fix build on 10/head
  - Respect CFLAGS, STRIP
  - Stage support
  
  PR:		ports/184865
  Submitted by:	KATO Tsuguru

Deleted:
  head/textproc/amberfish/files/patch-Makefile.in
  head/textproc/amberfish/pkg-plist
Modified:
  head/textproc/amberfish/Makefile

Modified: head/textproc/amberfish/Makefile
==============================================================================
--- head/textproc/amberfish/Makefile	Wed Jan 15 19:25:17 2014	(r339808)
+++ head/textproc/amberfish/Makefile	Wed Jan 15 19:36:26 2014	(r339809)
@@ -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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 dfilter service freebsd_committer 2014-01-15 19:43:33 UTC
Author: antoine
Date: Wed Jan 15 19:43:25 2014
New Revision: 339810
URL: http://svnweb.freebsd.org/changeset/ports/339810
QAT: https://qat.redports.org/buildarchive/r339810/

Log:
  MFH: r339809
  
  - Fix build on 10/head
  - Respect CFLAGS, STRIP
  - Stage support
  
  PR:		ports/184865
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Deleted:
  branches/2014Q1/textproc/amberfish/files/patch-Makefile.in
  branches/2014Q1/textproc/amberfish/pkg-plist
Modified:
  branches/2014Q1/textproc/amberfish/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/amberfish/Makefile
==============================================================================
--- branches/2014Q1/textproc/amberfish/Makefile	Wed Jan 15 19:36:26 2014	(r339809)
+++ branches/2014Q1/textproc/amberfish/Makefile	Wed Jan 15 19:43:25 2014	(r339810)
@@ -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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Antoine Brodin freebsd_committer 2014-01-15 19:44:58 UTC
State Changed
From-To: open->closed

Patch committed to head and 2014Q1 branch, thanks!