From owner-svn-ports-head@FreeBSD.ORG Fri Feb 21 15:57:05 2014 Return-Path: Delivered-To: svn-ports-head@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 A30F4BF6; Fri, 21 Feb 2014 15:57:05 +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 8E5811D6E; Fri, 21 Feb 2014 15:57:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1LFv5S2032805; Fri, 21 Feb 2014 15:57:05 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1LFv5S8032802; Fri, 21 Feb 2014 15:57:05 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402211557.s1LFv5S8032802@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 21 Feb 2014 15:57:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345509 - head/www/websh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2014 15:57:05 -0000 Author: gahr Date: Fri Feb 21 15:57:04 2014 New Revision: 345509 URL: http://svnweb.freebsd.org/changeset/ports/345509 QAT: https://qat.redports.org/buildarchive/r345509/ Log: - Convert to USES=gmake tcl - STAGE-clean Modified: head/www/websh/Makefile head/www/websh/pkg-plist Modified: head/www/websh/Makefile ============================================================================== --- head/www/websh/Makefile Fri Feb 21 15:53:07 2014 (r345508) +++ head/www/websh/Makefile Fri Feb 21 15:57:04 2014 (r345509) @@ -16,18 +16,20 @@ MAKE_JOBS_UNSAFE= yes TCL_DVER= ${TCL_VER:S/.//} -USE_TCL= 84+ +USES= gmake tcl:84,85 USE_AUTOTOOLS= autoconf WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \ --with-tcl=${TCL_LIBDIR} -USE_GMAKE= yes USE_LDCONFIG= yes SUB_FILES= httpd.conf pkgIndex.tcl pkg-message SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION} SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} PLIST_SUB+= TCL_DVER=${TCL_DVER} +PORTDOCS= * +PORTEXAMPLES= * + USE_APACHE= 22+ CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir` @@ -36,7 +38,6 @@ CPPFLAGS+= -I ${LOCALBASE}/include/apr-1 CPPFLAGS+= -Wall -Werror .endif -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's,/usr/local/websh,${PREFIX},' \ ${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf @@ -61,27 +62,26 @@ post-build test: {print}' do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/*.ws3 \ - ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/${PORTNAME}/ + ${WRKDIR}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf \ - ${PREFIX}/etc/websh.conf.dist + ${STAGEDIR}${PREFIX}/etc/websh.conf.dist + ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_DATA} ${WRKSRC}/mod_websh${PORTVERSION}.so \ - ${PREFIX}/${APACHEMODDIR}/mod_websh.so - ${INSTALL_DATA} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 ${PREFIX}/lib + ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so + ${INSTALL_DATA} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \ + ${STAGEDIR}${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/libwebsh${TCL_DVER}.so.1 \ - ${PREFIX}/lib/libwebsh${TCL_DVER}.so -.if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR} + ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \ ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.whtml \ - ${WRKDIR}/httpd.conf ${EXAMPLESDIR}/ - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC:H:H}/doc/html/* ${DOCSDIR} -.endif + ${WRKDIR}/httpd.conf ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC:H:H}/doc/html/* ${STAGEDIR}${DOCSDIR} post-install: @${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/mod_${MODULENAME}.so" - @${CAT} ${PKGMESSAGE} .include Modified: head/www/websh/pkg-plist ============================================================================== --- head/www/websh/pkg-plist Fri Feb 21 15:53:07 2014 (r345508) +++ head/www/websh/pkg-plist Fri Feb 21 15:57:04 2014 (r345509) @@ -5,25 +5,6 @@ lib/websh/htmlhandler.ws3 lib/websh/otherhandler.ws3 @dirrm lib/websh/ etc/websh.conf.dist -%%PORTDOCS%%%%EXAMPLESDIR%%/index.whtml -%%PORTDOCS%%%%EXAMPLESDIR%%/myApp.ws3 -%%PORTDOCS%%%%EXAMPLESDIR%%/other.whtml -%%PORTDOCS%%%%EXAMPLESDIR%%/httpd.conf -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%%%DOCSDIR%%/Apache_module_specific_commands.html -%%PORTDOCS%%%%DOCSDIR%%/command_dispatching_and_session_management.html -%%PORTDOCS%%%%DOCSDIR%%/configuration.html -%%PORTDOCS%%%%DOCSDIR%%/context_handling.html -%%PORTDOCS%%%%DOCSDIR%%/data_encryption.html -%%PORTDOCS%%%%DOCSDIR%%/file_handling_and_file_IO.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/inter-process_and_-system_communication.html -%%PORTDOCS%%%%DOCSDIR%%/logging.html -%%PORTDOCS%%%%DOCSDIR%%/misc_commands.html -%%PORTDOCS%%%%DOCSDIR%%/request_data_handling.html -%%PORTDOCS%%%%DOCSDIR%%/response_data_handling.html -%%PORTDOCS%%%%DOCSDIR%%/uri-html-_en-decoding.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%APACHEMODDIR%%/mod_websh.so @exec %D/sbin/apxs -e -A -n websh %D/%F @unexec %D/sbin/apxs -e -A -n websh %D/%F