Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Dec 2013 22:45:35 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336967 - head/www/webstone-ssl
Message-ID:  <201312192245.rBJMjZQ8044008@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Dec 19 22:45:34 2013
New Revision: 336967
URL: http://svnweb.freebsd.org/changeset/ports/336967

Log:
  - Fix build with clang
  - Support staging
  
  PR:		ports/184850
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/www/webstone-ssl/Makefile   (contents, props changed)

Modified: head/www/webstone-ssl/Makefile
==============================================================================
--- head/www/webstone-ssl/Makefile	Thu Dec 19 22:21:08 2013	(r336966)
+++ head/www/webstone-ssl/Makefile	Thu Dec 19 22:45:34 2013	(r336967)
@@ -12,36 +12,34 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	World wide web server benchmarking with SSL support
 
+WRKSRC=		${WRKDIR}/WebStone${PORTVERSION}/src
+
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	autoconf213
-GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/WebStone${PORTVERSION}/src
 ALL_TARGET=	install
-NO_INSTALL_MANPAGES=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ENV=	LIBS=-L${OPENSSLLIB}
-CFLAGS+=	-I${OPENSSLINC}
+CPPFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
+
+pre-configure:
+	@${RM} -f ${WRKSRC}/config.cache
 
-NO_STAGE=	yes
 do-install:
 	@${RMDIR} ${WRKSRC}/../bin/runs
-	@${MKDIR} ${PREFIX}/webstone-ssl/bin
-	@${MKDIR} ${PREFIX}/webstone-ssl/conf
-	@${MKDIR} ${PREFIX}/webstone-ssl/lgm
-	${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${PREFIX}/webstone-ssl/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${PREFIX}/webstone-ssl/lgm
-	${INSTALL_DATA} ${WRKSRC}/../conf/* ${PREFIX}/webstone-ssl/conf
-	${INSTALL_SCRIPT} ${WRKSRC}/../webstone  ${PREFIX}/webstone-ssl
+	@${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/conf
+	@${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm
+	${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone-ssl/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone-ssl/lgm
+	${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone-ssl/conf
+	${INSTALL_SCRIPT} ${WRKSRC}/../webstone  ${STAGEDIR}${PREFIX}/webstone-ssl
 	@${MKDIR} ${WRKSRC}/../bin/runs
-.for file in webclient webmaster genrand
-	${STRIP_CMD} ${PREFIX}/webstone-ssl/bin/${file}
+.for i in webclient webmaster genrand
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/bin/${i}
 .endfor
-.for file in ws20_cgi ws25_cgi
-	${STRIP_CMD} ${PREFIX}/webstone-ssl/lgm/${file}
+.for i in ws20_cgi ws25_cgi
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm/${i}
 .endfor
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312192245.rBJMjZQ8044008>