svn commit: r431459 - in head/textproc/sablotron: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Jan 14 09:01:10 2017
New Revision: 431459
URL: https://svnweb.freebsd.org/changeset/ports/431459

Log:
  - Fix LICENSE
  - Switch to USES=localbase
  - Switch to options helpers
  - Regenerate patches

Modified:
  head/textproc/sablotron/Makefile
  head/textproc/sablotron/files/patch-configure

Modified: head/textproc/sablotron/Makefile
==============================================================================
--- head/textproc/sablotron/Makefile	Sat Jan 14 08:40:40 2017	(r431458)
+++ head/textproc/sablotron/Makefile	Sat Jan 14 09:01:10 2017	(r431459)
@@ -10,11 +10,18 @@ MASTER_SITES=	SF/sablotron/sablotron-${P
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
 
-LICENSE=	MPL GPLv2
+LICENSE=	MPL GPLv2+
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
+GNU_CONFIGURE=	yes
+USES=		gmake iconv libtool localbase:ldflags
+USE_LDCONFIG=	yes
+LDFLAGS+=	${ICONV_LIB}
+
+PORTDOCS=	*
+
 OPTIONS_DEFINE=	DEBUGGER DISABLE_META DOCS DOCUMENT_ERRORS DOM
 
 DEBUGGER_DESC=		Enable debugger
@@ -33,20 +40,15 @@ DOCS_USE=			PERL5=build
 DOM_CONFIGURE_ENABLE=		dom
 DOCUMENT_ERRORS_CONFIGURE_ENABLE=	document-errors
 
-GNU_CONFIGURE=	yes
-USES=		gmake iconv libtool
-USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lexpat ${ICONV_LIB}
-
-PORTDOCS=	*
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/apidoc//' ${WRKSRC}/doc/Makefile.in
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "README README_JS RELEASE \
-		doc/misc/DEBUGGER doc/misc/NOTES" ${STAGEDIR}${DOCSDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} README README_JS RELEASE \
+		doc/misc/DEBUGGER doc/misc/NOTES ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/textproc/sablotron/files/patch-configure
==============================================================================
--- head/textproc/sablotron/files/patch-configure	Sat Jan 14 08:40:40 2017	(r431458)
+++ head/textproc/sablotron/files/patch-configure	Sat Jan 14 09:01:10 2017	(r431459)
@@ -1,6 +1,6 @@
---- configure.orig
+--- configure.orig	2005-06-07 15:29:14 UTC
 +++ configure
-@@ -22091,14 +22091,13 @@
+@@ -22091,14 +22091,13 @@ fi
    if test ! x$silent = xyes; then
      exec 6>&1
    fi