Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 May 2014 21:18:55 +0600 (BDT)
From:      Muhammad Moinur Rahman <5u623l20@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/190311: [PATCH] net-mgmt/hawk: Add STAGE support, take maintainership
Message-ID:  <201405271518.s4RFItbY003084@bofh.1asiacom.net>
Resent-Message-ID: <201405271520.s4RFK0du008041@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         190311
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/hawk: Add STAGE support, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 27 15:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Muhammad Moinur Rahman
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD bofh.1asiacom.net 11.0-CURRENT FreeBSD 11.0-CURRENT #2 r265972: Wed May 14 02:05:04 BDT
>Description:
- Add STAGE support
- Add LICENSE
- Take maintainership

For Committer's reference:
http://pdr.s.ubze.ro/bulk/latest-per-pkg/hawk/0.6_2/

Generated with FreeBSD Port Tools 1.02 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- hawk-0.6.patch begins here ---
diff -ruN /usr/ports//net-mgmt/hawk/Makefile ./Makefile
--- /usr/ports//net-mgmt/hawk/Makefile	2013-09-21 04:24:43.000000000 +0600
+++ ./Makefile	2014-05-27 20:16:39.065933238 +0600
@@ -2,13 +2,15 @@
 
 PORTNAME=	hawk
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/iphawk/iphawk/Hawk%20${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Track uptime and DNS status for machines on your networks
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	p5-Net-Netmask>0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
 		p5-Net-Ping-External>0:${PORTSDIR}/net/p5-Net-Ping-External \
 		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
@@ -22,49 +24,37 @@
 USE_RC_SUBR=	hawk
 
 SUB_LIST=	PERL=${PERL}
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+.include <bsd.port.options.mk>
 post-patch:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' \
-	    ${WRKSRC}/daemon/hawk > ${WRKSRC}/daemon/hawk.sed
-	@${MV} ${WRKSRC}/daemon/hawk.sed ${WRKSRC}/daemon/hawk
-	@${SED} -e 's#hawk.conf.inc#${PREFIX}/etc/hawk/php.conf#' \
-	    ${WRKSRC}/php/hawk.php > ${WRKSRC}/php/hawk.php.sed
-	@${MV} ${WRKSRC}/php/hawk.php.sed ${WRKSRC}/php/hawk.php
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#' \
+	    ${WRKSRC}/daemon/hawk
+	@${REINPLACE_CMD} -e 's#hawk.conf.inc#${PREFIX}/etc/hawk/php.conf#' \
+	    ${WRKSRC}/php/hawk.php
 
 do-build:
-# Empty target, nothing to build
 
 do-install:
-	${MKDIR} ${PREFIX}/etc/hawk
-	${INSTALL_DATA} ${WRKSRC}/daemon/hawk.conf ${PREFIX}/etc/hawk/daemon.conf.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/daemon/hawk ${PREFIX}/sbin
-	${MKDIR} ${WWWDIR}/images
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/daemon/hawk.conf ${STAGEDIR}${ETCDIR}/daemon.conf.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/daemon/hawk ${STAGEDIR}${PREFIX}/sbin
+	${MKDIR} ${STAGEDIR}${WWWDIR}/images
 	(for f in ${WRKSRC}/php/images/* ${FILESDIR}/favicon.ico; do \
-		${INSTALL_DATA} $$f ${WWWDIR}/images; \
+		${INSTALL_DATA} $$f ${STAGEDIR}${WWWDIR}/images; \
 	done)
-	${INSTALL_DATA} ${WRKSRC}/php/hawk.php ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/php/hawk.css ${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/php/hawk.php ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/php/hawk.css ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/php/hawk.conf.inc \
-	    ${PREFIX}/etc/hawk/php.conf.sample
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/create_hawk_db.sql ${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/create_hawk_user.sql ${DOCSDIR}
-.endif
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
+	    ${STAGEDIR}${ETCDIR}/php.conf.sample
 
 post-install:
-	@${ECHO} '******************************************************************************' > ${PKGMESSAGE}
-	@${ECHO} '***    See ${PREFIX}/share/doc/hawk/create_hawk* for instructions on	   ***' >> ${PKGMESSAGE}
-	@${ECHO} '***    creating the database and user that the PHP code expects.	   ***' >> ${PKGMESSAGE}
-	@${ECHO} '***									   ***' >> ${PKGMESSAGE}
-	@${ECHO} '***    Copy daemon.conf.sample and php.conf.sample to their non-sample     ***' >> ${PKGMESSAGE}
-	@${ECHO} '***    names in ${PREFIX}/etc/hawk, and configure local networks, etc.    ***' >> ${PKGMESSAGE}
-	@${ECHO} '******************************************************************************' >> ${PKGMESSAGE}
-
-	@${CAT} ${PKGMESSAGE}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/create_hawk_db.sql ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/create_hawk_user.sql ${STAGEDIR}${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff -ruN /usr/ports//net-mgmt/hawk/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports//net-mgmt/hawk/files/pkg-message.in	1970-01-01 06:00:00.000000000 +0600
+++ ./files/pkg-message.in	2014-05-27 20:16:13.670975196 +0600
@@ -0,0 +1,8 @@
+******************************************************************************
+****    See %%PREFIX%%/share/doc/hawk/create_hawk* for instructions on    ****
+****    creating the database and user that the PHP code expects.         ****
+****                                                                      ****
+****    Copy daemon.conf.sample and php.conf.sample to their non-sample   ****
+****    names in %%ETCDIR%% and configure local networks, etc.            ****
+******************************************************************************
+
diff -ruN /usr/ports//net-mgmt/hawk/pkg-plist ./pkg-plist
--- /usr/ports//net-mgmt/hawk/pkg-plist	2014-01-22 21:16:56.000000000 +0600
+++ ./pkg-plist	2014-05-27 20:17:18.595931985 +0600
@@ -1,5 +1,5 @@
-etc/hawk/daemon.conf.sample
-etc/hawk/php.conf.sample
+%%ETCDIR%%/daemon.conf.sample
+%%ETCDIR%%/php.conf.sample
 sbin/hawk
 %%WWWDIR%%/images/bluesphere.png
 %%WWWDIR%%/images/favicon.ico
@@ -15,6 +15,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/create_hawk_db.sql
 %%PORTDOCS%%%%DOCSDIR%%/create_hawk_user.sql
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/hawk
+@dirrmtry %%ETCDIR%%
 @dirrm %%WWWDIR%%/images
 @dirrm %%WWWDIR%%
--- hawk-0.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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