svn commit: r368120 - head/www/mod_cplusplus

[Tijl Coosemans]

Author: tijl
Date: Sat Sep 13 16:47:09 2014
New Revision: 368120
URL: http://svnweb.freebsd.org/changeset/ports/368120
QAT: https://qat.redports.org/buildarchive/r368120/

Log:
  - Convert to USES=libtool
  - Replace pre-configure with USE_AUTOTOOLS=libtoolize
  - Use INSTALL_LIB to install library

Modified:
  head/www/mod_cplusplus/Makefile

Modified: head/www/mod_cplusplus/Makefile
==============================================================================
--- head/www/mod_cplusplus/Makefile	Sat Sep 13 15:30:13 2014	(r368119)
+++ head/www/mod_cplusplus/Makefile	Sat Sep 13 16:47:09 2014	(r368120)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_cplusplus
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF/modcplusplus/modcplusplus/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -11,33 +11,29 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache at FreeBSD.org
 COMMENT=	Apache module for loading C++ objects as handlers
 
-
+USES=		libtool
 USE_APACHE=	22
-USE_AUTOTOOLS=	autoconf autoheader libtool automake aclocal
-CFLAGS+=	-I${LOCALBASE}/include
+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
+AUTOMAKE_ARGS=	-a -c -f
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-apxs=${APXS}
-ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS+=	-a
+CONFIGURE_ARGS=	--with-apxs=${APXS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 SUB_FILES=	pkg-message
 SUB_LIST=	"APACHEMODDIR=${APACHEMODDIR}"
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
-post-extract:
+post-patch:
 	${REINPLACE_CMD} -e 's,-Werror,,' ${WRKSRC}/configure.in
 
-pre-configure:
-	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy)
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/.libs/libmod_cplusplus.so \
+	${INSTALL_LIB} ${WRKSRC}/src/.libs/libmod_cplusplus.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_cplusplus.so
 
 .include <bsd.port.mk>