Index: head/sysutils/smartmontools/Makefile =================================================================== --- head/sysutils/smartmontools/Makefile (revision 148682) +++ head/sysutils/smartmontools/Makefile (revision 148683) @@ -1,54 +1,54 @@ # New ports collection makefile for: smartmontools # Date created: 12 October 2003 # Whom: Eduard Martinescu # # $FreeBSD$ # PORTNAME= smartmontools PORTVERSION= 5.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= martines@rochester.rr.com COMMENT= S.M.A.R.T. disk monitoring tools USE_GMAKE= yes USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-initscriptdir=${PREFIX}/etc/rc.d \ --with-docdir=${DOCSDIR} --enable-sample CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PROGRAMS= smartctl smartd MAN5= smartd.conf.5 MAN8= smartd.8 smartctl.8 DOCS= AUTHORS CHANGELOG INSTALL NEWS README TODO WARNINGS EXAMPLES= smartd.conf examplescripts/README examplescripts/Example? RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} post-build: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/smartd.sh > ${WRKDIR}/smartd.sh do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/sbin cd ${WRKSRC} && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5 cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/smartd.conf.sample ${PREFIX}/etc ${INSTALL_SCRIPT} ${WRKDIR}/smartd.sh ${PREFIX}/etc/rc.d/smartd.sh @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif .include post-install: ${CAT} ${PKGMESSAGE} .include Property changes on: head/sysutils/smartmontools/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/sysutils/smartmontools/files/smartd.sh =================================================================== --- head/sysutils/smartmontools/files/smartd.sh (revision 148682) +++ head/sysutils/smartmontools/files/smartd.sh (revision 148683) @@ -1,42 +1,44 @@ #!/bin/sh # $FreeBSD$ # PROVIDE: smartd # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: FreeBSD shutdown # Define these smartd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # /etc/rc.conf.d/smartd # # DO NOT CHANGE THESE DEFAULT VALUES HERE # smartd_enable="NO" -smartd_flags="" smartd_pidfile="/var/run/smartd.pid" . %%RC_SUBR%% name="smartd" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/smartd" -required_files="%%PREFIX%%/etc/smartd.conf" load_rc_config $name +: ${smartd_config="%%PREFIX%%/etc/smartd.conf"} +: ${smartd_flags="--configfile=${smartd_config}"} + pidfile="${smartd_pidfile}" +required_files="${smartd_config}" case "${smartd_flags}" in *-p\ *) echo "ERROR: \$smartd_flags includes -p option." \ "Please use \$smartd_pidfile instead." exit 1 ;; *) smartd_flags="-p ${pidfile} ${smartd_flags}" ;; esac run_rc_command "$1" Property changes on: head/sysutils/smartmontools/files/smartd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/sysutils/smartmontools-devel/Makefile =================================================================== --- head/sysutils/smartmontools-devel/Makefile (revision 148682) +++ head/sysutils/smartmontools-devel/Makefile (revision 148683) @@ -1,54 +1,54 @@ # New ports collection makefile for: smartmontools # Date created: 12 October 2003 # Whom: Eduard Martinescu # # $FreeBSD$ # PORTNAME= smartmontools PORTVERSION= 5.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= martines@rochester.rr.com COMMENT= S.M.A.R.T. disk monitoring tools USE_GMAKE= yes USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-initscriptdir=${PREFIX}/etc/rc.d \ --with-docdir=${DOCSDIR} --enable-sample CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PROGRAMS= smartctl smartd MAN5= smartd.conf.5 MAN8= smartd.8 smartctl.8 DOCS= AUTHORS CHANGELOG INSTALL NEWS README TODO WARNINGS EXAMPLES= smartd.conf examplescripts/README examplescripts/Example? RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} post-build: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/smartd.sh > ${WRKDIR}/smartd.sh do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/sbin cd ${WRKSRC} && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5 cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/smartd.conf.sample ${PREFIX}/etc ${INSTALL_SCRIPT} ${WRKDIR}/smartd.sh ${PREFIX}/etc/rc.d/smartd.sh @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif .include post-install: ${CAT} ${PKGMESSAGE} .include Property changes on: head/sysutils/smartmontools-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/sysutils/smartmontools-devel/files/smartd.sh =================================================================== --- head/sysutils/smartmontools-devel/files/smartd.sh (revision 148682) +++ head/sysutils/smartmontools-devel/files/smartd.sh (revision 148683) @@ -1,42 +1,44 @@ #!/bin/sh # $FreeBSD$ # PROVIDE: smartd # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: FreeBSD shutdown # Define these smartd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # /etc/rc.conf.d/smartd # # DO NOT CHANGE THESE DEFAULT VALUES HERE # smartd_enable="NO" -smartd_flags="" smartd_pidfile="/var/run/smartd.pid" . %%RC_SUBR%% name="smartd" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/smartd" -required_files="%%PREFIX%%/etc/smartd.conf" load_rc_config $name +: ${smartd_config="%%PREFIX%%/etc/smartd.conf"} +: ${smartd_flags="--configfile=${smartd_config}"} + pidfile="${smartd_pidfile}" +required_files="${smartd_config}" case "${smartd_flags}" in *-p\ *) echo "ERROR: \$smartd_flags includes -p option." \ "Please use \$smartd_pidfile instead." exit 1 ;; *) smartd_flags="-p ${pidfile} ${smartd_flags}" ;; esac run_rc_command "$1" Property changes on: head/sysutils/smartmontools-devel/files/smartd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property