Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 May 2014 17:12:41 +0000 (UTC)
From:      Stefan Esser <se@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r354872 - in head/security/libwhisker: . files
Message-ID:  <201405221712.s4MHCfJA059775@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: se
Date: Thu May 22 17:12:40 2014
New Revision: 354872
URL: http://svnweb.freebsd.org/changeset/ports/354872
QAT: https://qat.redports.org/buildarchive/r354872/

Log:
  Fix port to support staging and perform the following build changes:
  
  - fetch from sourceforge instead of directly from author's site
  - set LICENSE: a simplified 2 clause BSD license is granted in CHANGES
  - use new build option syntax in Makefile (option: DOCS)
  - update the URL in pkg-descr (the old one leads to an error page)
  - set MAINTAINER
  
  There are no functional changes.
  
  Approved by: antoine (mentor)

Added:
  head/security/libwhisker/files/
  head/security/libwhisker/files/patch-Makefile.pl   (contents, props changed)
Modified:
  head/security/libwhisker/Makefile
  head/security/libwhisker/pkg-descr

Modified: head/security/libwhisker/Makefile
==============================================================================
--- head/security/libwhisker/Makefile	Thu May 22 16:40:55 2014	(r354871)
+++ head/security/libwhisker/Makefile	Thu May 22 17:12:40 2014	(r354872)
@@ -4,41 +4,34 @@
 PORTNAME=	libwhisker
 PORTVERSION=	2.5
 CATEGORIES=	security perl5
-MASTER_SITES=	http://www.wiretrip.net/rfp/${PORTNAME}/
+MASTER_SITES=	SF/whisker/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	se@FreeBSD.org
 COMMENT=	Perl module to create HTTP test scripts
 
-WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
+LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
 USES=		perl5
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
+PLIST_FILES=	${SITE_PERL_REL}/LW2.pm \
+		%%PERL5_MAN3%%/LW2.3pm.gz
 
-PLIST_FILES=	${SITE_PERL_REL}/LW2.pm
+OPTIONS_DEFINE=	DOCS
 
-MAN3=		LW2.3pm
-MANPREFIX=	${LOCALBASE}/lib/perl5/${PERL_VER}/perl/
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
-
-NO_STAGE=	yes
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.pl lib
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.pl ${INSTALL_TARGET}
-	@${INSTALL_DATA} ${WRKSRC}/LW2.pm ${SITE_PERL}
-	@${CHMOD} 444 ${SITE_PERL}/LW2.pm
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/docs ${DOCSDIR}/scripts
-	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGES KNOWNBUGS ${DOCSDIR}
-	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} * ${DOCSDIR}/docs
-	cd ${WRKSRC}/scripts/ && ${INSTALL_SCRIPT} * ${DOCSDIR}/scripts
-.endif
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}
+	@${MKDIR} ${STAGEDIR}${MAN3PREFIX}/man/man3
+	cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${PERL5} Makefile.pl install
+	@${CHMOD} 444 ${STAGEDIR}${SITE_PERL}/LW2.pm
+	@${CHMOD} 444 ${STAGEDIR}${MAN3PREFIX}/man/man3/LW2.3pm
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts
+	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGES KNOWNBUGS ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/docs
+	cd ${WRKSRC}/scripts/ && ${INSTALL_SCRIPT} * ${STAGEDIR}${DOCSDIR}/scripts
 
 .include <bsd.port.mk>

Added: head/security/libwhisker/files/patch-Makefile.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libwhisker/files/patch-Makefile.pl	Thu May 22 17:12:40 2014	(r354872)
@@ -0,0 +1,11 @@
+--- ./Makefile.pl.orig	2010-01-24 04:35:26.000000000 +0000
++++ ./Makefile.pl	2014-05-21 16:29:01.000000000 +0000
+@@ -171,7 +171,7 @@
+ 	command_build() if(!-e $TARGET);
+ 	die("Can not install without Config.pm") if($MODULES{Config}==0);
+ 	$CWD=&cwd if($MODULES{Cwd}>0);
+-	my $where=$DESTDIR . $Config{'man3direxp'};
++	my $where=$DESTDIR . $Config{'siteman3direxp'};
+ 	my $t = $TARGET;
+ 	if($LIBRARY){
+ 		$t="$PACKAGE.3pm";

Modified: head/security/libwhisker/pkg-descr
==============================================================================
--- head/security/libwhisker/pkg-descr	Thu May 22 16:40:55 2014	(r354871)
+++ head/security/libwhisker/pkg-descr	Thu May 22 17:12:40 2014	(r354872)
@@ -8,4 +8,4 @@ Libwhisker has a few design principles:
 - Contained: designed to not require external modules when possible
 - Localized: does not require installation to use
 
-WWW: http://www.wiretrip.net/rfp/lw.asp
+WWW: http://sourceforge.net/projects/whisker/



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