Date: Mon, 19 Jan 2004 06:35:40 +0300 From: Sergey Matveychuk <sem@ciam.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61561: [MAINTAINER] ftp/frox: update to 0.7.12 Message-ID: <E1AiQCS-00073W-TO@Current.sem-home.ciam.ru> Resent-Message-ID: <200401190340.i0J3eFuN062840@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61561 >Category: ports >Synopsis: [MAINTAINER] ftp/frox: update to 0.7.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 18 19:40:15 PST 2004 >Closed-Date: >Last-Modified: >Originator: Sergey Matveychuk >Release: FreeBSD 5.2-RELEASE i386 >Organization: >Environment: System: FreeBSD Current.sem-home.ciam.ru 5.2-RELEASE FreeBSD 5.2-RELEASE #6: Sat Jan 17 16:12:04 MSK 2004 >Description: - Update to 0.7.12 - use rcNG script - make configure script ahppy with CONFIGURE_TARGET - use PORTDOCS to autoaddition docs in PLIST Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- frox-0.7.12.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ftp/frox.orig/Makefile /usr/ports/ftp/frox/Makefile --- /usr/ports/ftp/frox.orig/Makefile Mon Jan 19 05:41:35 2004 +++ /usr/ports/ftp/frox/Makefile Mon Jan 19 06:22:34 2004 @@ -6,7 +6,7 @@ # PORTNAME= frox -PORTVERSION= 0.7.11 +PORTVERSION= 0.7.12 CATEGORIES= ftp MASTER_SITES= http://www.hollo.org/frox/download/ \ http://frox.sourceforge.net/download/ \ @@ -19,11 +19,22 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} + +USE_RC_SUBR= yes +RC_DIR?= ${PREFIX}/etc/rc.d +RC_SUFX?= .sh +SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ + -e 's|%%RC_DIR%%|${RC_DIR}|g' \ + -e 's|%%RC_SUFX%%|${RC_SUFX}|g' + +PLIST_SUB+= RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX} MAN1= frox.1 MAN5= frox.conf.5 -DOCS= FAQ SECURITY CREDITS ChangeLog +PORTDOCS= FAQ SECURITY CREDITS ChangeLog PKGMESSAGE= ${WRKDIR}/pkg-message @@ -63,7 +74,8 @@ @${ECHO_MSG} "" pre-patch: - @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE} + @${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message >${PKGMESSAGE} + @${SED} ${SED_SCRIPT} ${FILESDIR}/frox.sh > ${WRKDIR}/frox.sh do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/frox ${PREFIX}/sbin @@ -74,15 +86,13 @@ post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -.for f in ${DOCS} +.for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} .endfor .endif - @${STRIP_CMD} ${PREFIX}/sbin/frox - @if [ ! -f ${PREFIX}/etc/rc.d/${PORTNAME}.sh ]; then \ - ${ECHO_MSG} "Install ${PREFIX}/etc/rc.d/${PORTNAME}.sh startup file."; \ - ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d/${PORTNAME}.sh; \ - fi - @${CAT} ${PKGMESSAGE} + @${STRIP_CMD} ${PREFIX}/sbin/frox; \ + ${ECHO_MSG} "Install ${RC_DIR}/frox${RC_SUFX} startup file."; \ + ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/frox.sh ${RC_DIR}/frox${RC_SUFX}; \ + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/ftp/frox.orig/distinfo /usr/ports/ftp/frox/distinfo --- /usr/ports/ftp/frox.orig/distinfo Mon Jan 19 05:41:35 2004 +++ /usr/ports/ftp/frox/distinfo Mon Jan 19 06:23:40 2004 @@ -1 +1 @@ -MD5 (frox-0.7.11.tar.bz2) = 1e35825e4ef0e080fc5927271532a818 +MD5 (frox-0.7.12.tar.bz2) = 30b3af5bc8cfdb0c751e02f03a69615d diff -ruN --exclude=CVS /usr/ports/ftp/frox.orig/files/frox.sh /usr/ports/ftp/frox/files/frox.sh --- /usr/ports/ftp/frox.orig/files/frox.sh Mon Jan 19 05:41:35 2004 +++ /usr/ports/ftp/frox/files/frox.sh Mon Jan 19 05:44:53 2004 @@ -1,23 +1,52 @@ #!/bin/sh +# +# $FreeBSD$ +# -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -x ${PREFIX}/sbin/frox -a -f ${PREFIX}/etc/frox.conf ] - ! grep -iq '^[[:space:]]*frominetd[[:space:]]*yes' ${PREFIX}/etc/frox.conf && \ - ${PREFIX}/sbin/frox && \ - echo -n ' frox' - ;; -stop) - [ -f /var/run/frox.pid ] && kill `cat /var/run/frox.pid` && echo -n ' frox' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac +# PROVIDE: frox +# REQUIRE: NETWORKING +# KEYWORD: FreeBSD shutdown -exit 0 +# +# Add the following lines to /etc/rc.conf to enable frox: +# +#frox_enable="YES" +# +# See frox(8) for flags +# + +. %%RC_SUBR%% + +name=frox +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/frox +pidfile=/var/run/frox.pid +required_files=%%PREFIX%%/etc/frox.conf + +start_precmd=start_precmd +stop_postcmd=stop_postcmd + +# if require start from inetd? +start_precmd() +{ + if grep -iq '^[[:space:]]*frominetd[[:space:]]*yes' %%PREFIX%%/etc/frox.conf; + then + return 1 + else + return 0 + fi +} + +stop_postcmd() +{ + rm -f $pidfile +} + +# set defaults + +frox_enable=${frox_enable:-"NO"} +frox_flags=${frox_flags:-""} + +load_rc_config $name +run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/ftp/frox.orig/pkg-message /usr/ports/ftp/frox/pkg-message --- /usr/ports/ftp/frox.orig/pkg-message Mon Jan 19 05:41:35 2004 +++ /usr/ports/ftp/frox/pkg-message Mon Jan 19 06:21:28 2004 @@ -1,8 +1,9 @@ ************************************************************************** NOTES: Don't forget to create %%PREFIX%%/etc/frox.conf -from %%PREFIX%%/etc/frox.conf.sample and then run frox by -%%PREFIX%%/etc/rc.d/frox.sh start +from %%PREFIX%%/etc/frox.conf.sample. +Then add `frox_enable="YES"' in /etc/rc.conf and run frox with +%%RC_DIR%%/frox%%RC_SUFX%% start Or you can run frox with inetd this way: * uncomment 'FromInetd yes' in your %%PREFIX%%/etc/frox.conf diff -ruN --exclude=CVS /usr/ports/ftp/frox.orig/pkg-plist /usr/ports/ftp/frox/pkg-plist --- /usr/ports/ftp/frox.orig/pkg-plist Mon Jan 19 05:41:35 2004 +++ /usr/ports/ftp/frox/pkg-plist Mon Jan 19 05:52:08 2004 @@ -1,8 +1,3 @@ sbin/frox etc/frox.conf.sample etc/rc.d/frox.sh -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/SECURITY -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- frox-0.7.12.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?E1AiQCS-00073W-TO>