Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  8 Nov 2010 02:18:32 +0800 (CST)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        martinp@tildeslash.com
Subject:   ports/152023: [PATCH] sysutils/monit: pet portlint, minor fixes
Message-ID:  <20101107181832.0E2702AEC4DA@sunpoet.net>
Resent-Message-ID: <201011071820.oA7IKE6r000963@freefall.freebsd.org>

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

>Number:         152023
>Category:       ports
>Synopsis:       [PATCH] sysutils/monit: pet portlint, minor fixes
>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:   Sun Nov 07 18:20:14 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Oct 23 16:01:16 CST 2010
>Description:
- Pet portlint
- Simplifiy PORTDOCS installation
- Use INSTAL

Port maintainer (martinp@tildeslash.com) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- monit-5.2.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- Makefile	7 Nov 2010 16:25:40 -0000	1.19
+++ Makefile	7 Nov 2010 17:52:27 -0000
@@ -16,14 +16,12 @@
 MAN1=		monit.1
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_BISON=	build
-USE_RC_SUBR=	monit.sh
+USE_GMAKE=	yes
+USE_RC_SUBR=	${PORTNAME}.sh
 
-CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
-		LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CONFIG_SHELL="${SH}" LOCALBASE="${LOCALBASE}"
 
 OPTIONS=	SSL "Enable SSL support" on
 
@@ -33,7 +31,9 @@
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-PORTDOCS=	*
+DOCS=		CHANGES.txt LICENSE README README.SSL \
+		doc/examples.html doc/monit.html
+PORTDOCS=	${DOCS:T}
 
 .include <bsd.port.pre.mk>
 
@@ -45,15 +45,10 @@
 .endif
 
 post-install:
-	${INSTALL_SCRIPT} -m 600 ${WRKDIR}/${DISTNAME}/monitrc ${PREFIX}/etc/monitrc.sample
+	${INSTALL} -m 600 ${WRKSRC}/monitrc ${PREFIX}/etc/monitrc.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_SCRIPT} -m 644 ${WRKDIR}/${DISTNAME}/CHANGES.txt ${PREFIX}/share/doc/monit/CHANGES.txt
-	${INSTALL_SCRIPT} -m 644 ${WRKDIR}/${DISTNAME}/LICENSE ${PREFIX}/share/doc/monit/LICENSE
-	${INSTALL_SCRIPT} -m 644 ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/monit/README
-	${INSTALL_SCRIPT} -m 644 ${WRKDIR}/${DISTNAME}/README.SSL ${PREFIX}/share/doc/monit/README.SSL
-	${INSTALL_SCRIPT} -m 644 ${WRKDIR}/${DISTNAME}/doc/examples.html ${PREFIX}/share/doc/monit/examples.html
-	${INSTALL_SCRIPT} -m 644 ${WRKDIR}/${DISTNAME}/doc/monit.html ${PREFIX}/share/doc/monit/monit.html
+	cd ${WRKSRC} && ${INSTALL} -m 644 ${DOCS} ${DOCSDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
 
--- monit-5.2.2.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?20101107181832.0E2702AEC4DA>