Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 May 2014 20:47:57 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355912 - in head/sysutils/healthd: . files
Message-ID:  <201405302047.s4UKlvaH070139@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Fri May 30 20:47:57 2014
New Revision: 355912
URL: http://svnweb.freebsd.org/changeset/ports/355912
QAT: https://qat.redports.org/buildarchive/r355912/

Log:
  - add stage support
  - move post-install hint into pkg-message
  - move port from apache@ to ports@ (port it is not apache@ related)

Added:
  head/sysutils/healthd/files/pkg-message.in   (contents, props changed)
Modified:
  head/sysutils/healthd/Makefile
  head/sysutils/healthd/pkg-plist

Modified: head/sysutils/healthd/Makefile
==============================================================================
--- head/sysutils/healthd/Makefile	Fri May 30 20:45:07 2014	(r355911)
+++ head/sysutils/healthd/Makefile	Fri May 30 20:47:57 2014	(r355912)
@@ -6,48 +6,35 @@ PORTVERSION=	0.7.9
 PORTREVISION=	2
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://healthd.thehousleys.net/ \
-		http://healthd1.thehousleys.net/
+		LOCAL/ohauer
 
-MAINTAINER=	apache@FreeBSD.org
-COMMENT=	A daemon to monitor vital motherboard parameters
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Daemon to monitor vital motherboard parameters
+
+LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	IPV6 FULL_CONFIG
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
 
-FULL_CONFIG_DESC= Remotely reading the full config
+FULL_CONFIG_DESC= 		Remotely reading the full config
+IPV6_CONFIGURE_ENABLE=		ipv6
+FULL_CONFIG_CONFIGURE_ENABLE=	full-config
+
+.include <bsd.port.options.mk>
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
-
-MAN8=		healthd.8 healthdc.8
+CONFIGURE_ARGS+=--exec-prefix=${PREFIX}
 INSTALL_TARGET=	install-all
+SUB_FILES=	pkg-message
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MFULL_CONFIG}
-CONFIGURE_ARGS+=	--enable-full-config
-.else
-CONFIGURE_ARGS+=	--disable-full-config
-.endif
+post-patch:
+	${REINPLACE_CMD} -e 's| @exec_prefix@| $$(DESTDIR)@exec_prefix@|' \
+		${WRKSRC}/Makefile.in
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/healthd.conf ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/healthd.conf configuration file."; \
-		${ECHO} "It is recommended you edit this file to match your system"; \
-		${ECHO} "before running the program."; \
-		${CP} ${PREFIX}/etc/healthd.conf.sample ${PREFIX}/etc/healthd.conf; \
-	fi
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/PROTOCOL ${DOCSDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/PROTOCOL ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/sysutils/healthd/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/healthd/files/pkg-message.in	Fri May 30 20:47:57 2014	(r355912)
@@ -0,0 +1,2 @@
+It is recommended to edit %%PREFIX%%/etc/healthd.conf  
+so it match the monitored system before running the program.

Modified: head/sysutils/healthd/pkg-plist
==============================================================================
--- head/sysutils/healthd/pkg-plist	Fri May 30 20:45:07 2014	(r355911)
+++ head/sysutils/healthd/pkg-plist	Fri May 30 20:47:57 2014	(r355912)
@@ -1,8 +1,8 @@
 bin/healthdc
+@sample etc/healthd.conf.sample
+man/man8/healthd.8.gz
+man/man8/healthdc.8.gz
 sbin/healthd
-@unexec if cmp -s %D/etc/healthd.conf %D/etc/healthd.conf.sample; then rm -f %D/etc/healthd.conf; fi
-etc/healthd.conf.sample
-@exec if [ ! -f %D/etc/healthd.conf ]; then cp -p %D/%F %B/healthd.conf; fi
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/PROTOCOL
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%



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