From owner-svn-ports-all@FreeBSD.ORG Sun Mar 9 18:09:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6011BFAC; Sun, 9 Mar 2014 18:09:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 406E23CA; Sun, 9 Mar 2014 18:09:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29I9ukL080857; Sun, 9 Mar 2014 18:09:56 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29I9tJu080855; Sun, 9 Mar 2014 18:09:55 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201403091809.s29I9tJu080855@svn.freebsd.org> From: Olli Hauer Date: Sun, 9 Mar 2014 18:09:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347676 - in head/www/mod_myvhost: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 18:09:56 -0000 Author: ohauer Date: Sun Mar 9 18:09:55 2014 New Revision: 347676 URL: http://svnweb.freebsd.org/changeset/ports/347676 QAT: https://qat.redports.org/buildarchive/r347676/ Log: - add stage support Modified: head/www/mod_myvhost/Makefile head/www/mod_myvhost/files/patch-Makefile Modified: head/www/mod_myvhost/Makefile ============================================================================== --- head/www/mod_myvhost/Makefile Sun Mar 9 18:04:06 2014 (r347675) +++ head/www/mod_myvhost/Makefile Sun Mar 9 18:09:55 2014 (r347676) @@ -14,7 +14,6 @@ LICENSE= APACHE20 MANUAL_PACKAGE_BUILD= needs apr and apache with DBD options enabled - USE_APACHE= 22+ UNIQUENAME= ${PORTNAME} @@ -28,7 +27,6 @@ OPTIONS_DEFAULT= PHP_MODULE PHP_MODULE_DESC= Enable PHP DEBUG_MODULE_DESC= Enable debugging -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDEBUG_MODULE} @@ -39,24 +37,26 @@ STRIP= # keep debug information .if ${PORT_OPTIONS:MPHP_MODULE} MAKE_ENV+= WITH_PHP=true USE_PHP= yes -USE_PHP_MOD= yes +WANT_PHP_MOD= yes .endif -.include - pre-patch: @${REINPLACE_CMD} -e "s|= apxs|= ${APXS}|" \ -e "s|= rm|= ${RM}|" -e "s|= ln|= ${LN}|" \ -e "s|= cp|= ${CP}|" ${WRKSRC}/Makefile +post-patch: + ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ + ${WRKSRC}/Makefile + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} + post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} + + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} -.include +.include Modified: head/www/mod_myvhost/files/patch-Makefile ============================================================================== --- head/www/mod_myvhost/files/patch-Makefile Sun Mar 9 18:04:06 2014 (r347675) +++ head/www/mod_myvhost/files/patch-Makefile Sun Mar 9 18:09:55 2014 (r347676) @@ -1,6 +1,6 @@ ---- ./Makefile.orig 2012-04-06 15:11:08.000000000 +0200 -+++ ./Makefile 2012-04-06 15:11:27.000000000 +0200 -@@ -16,8 +16,12 @@ +--- ./Makefile.orig 2014-03-09 18:49:26.000000000 +0100 ++++ ./Makefile 2014-03-09 18:51:04.000000000 +0100 +@@ -16,10 +16,15 @@ CP = /bin/cp -f CFLAGS = -Wc,-W -Wc,-Wall @@ -12,15 +12,18 @@ +.endif #CFLAGS+= -DWITH_PHP -DWITH_UID_GID -DWITH_CACHE LDFLAGS = ++APXS_STAGE= @APXS_STAGE@ -@@ -28,8 +32,8 @@ + default: all + +@@ -28,8 +33,8 @@ $(APACHE_MODULE): $(SRCS) $(APXS) -c $(CFLAGS) $(LDFLAGS) $(SRCS) -install: all - $(APXS) -i -a -n $(NAME) $(MODULE_LA) +install: $(MODULE_LA) -+ $(APXS) -i -A -n $(NAME) $(MODULE_LA) ++ $(APXS) $(APXS_STAGE) -i -n $(NAME) $(MODULE_LA) clean: $(RM) $(OBJS) $(APACHE_MODULE) *.slo *.lo mod_myvhost.la .libs