Attachment 211598 Details for Bug 244080 – The patch was generated by diff -ruN

[patch] The patch was generated by diff -ruN

patch.txt (text/plain), 5.31 KB, created by Sergey Anokhin on 2020-02-12 20:38:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Anokhin

Created: 2020-02-12 20:38:35 UTC

Size: 5.31 KB

patch

obsolete

>--- ./rntrack-back/Makefile     2009-10-23 17:46:06.000000000 +0400
>+++ ./rntrack/Makefile  2020-02-12 22:58:50.630140000 +0300
>@@ -1,47 +1,68 @@
>-# New ports collection makefile for:    rntrack
>-# Date created:                Fri Jan 14 00:57:28 MSK 2005
>-# Whom:                        Alex Soukhotine <ph0enix@users.sourceforge.net>
>-#
> # $FreeBSD$
>-#
>
> PORTNAME=      rntrack
>-PORTVERSION=   1.12
>-CATEGORIES=    mail
>-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=    ftrack-as
>-DISTNAME=      ${PORTNAME}-${PORTVERSION}
>+PORTVERSION=   2.0.26
>+CATEGORIES=    news mail
>+MASTER_SITES=  SF
>+MASTER_SITE_SUBDIR=    ftrack-as/RNtrack/${PORTVERSION}
>+DISTNAME=      rntrack-2_0_15-src
>
> MAINTAINER=    ph0enix@users.sourceforge.net
> COMMENT=       FTN Messages tracker
>
>-USE_BZIP2=     yes
>+LICENSE=       GPLv2
>+
>+USES=  tar:bzip2
>+
>+WRKSRC=        ${WRKDIR}/${DISTNAME}
>+
> USE_REINPLACE= yes
> ALL_TARGET=    ${PORTNAME}
> MAKEFILE=      ${WRKSRC}/MakeFiles/FreeBSD/Makefile
>-MAKE_ENV=      CONFIG\=${PREFIX}/etc/rntrack/rntrack.cfg
>-MAN1=          rntrack.1
>+MAKE_ENV=      CONFIG\=${PREFIX}/etc/fido/rntrack/rntrack.cfg
>
>-PORTDOCS=      FAQ FAQ.ru README README.ru report.err report.err.ru
>+DOCS=  FAQ FAQ.ru README README.ru report.err report.err.ru
>
>+OPTIONS_DEFINE=        LOG_PID SCRIPTS SYSLOG_FORMAT
>+
>+SCRIPTS_DESC=  Enable Perl scripts support
>+LOG_PID_DESC=  Enable pid logging
>+SYSLOG_FORMAT_DESC=    Use syslog-like log style
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MSYSLOG_FORMAT}
>+MAKE_ARGS+=    ENABLE_SYSLOG_LOG_FORMAT=1
>+.endif
>+
>+.if ${PORT_OPTIONS:MLOG_PID}
>+MAKE_ARGS+=    ENABLE_LOG_PID=1
>+.endif
>+
>+.if ${PORT_OPTIONS:MSCRIPTS}
>+USES+= perl5
>+MAKE_ARGS+=    ENABLE_SCRIPTS=1
>+.endif
>+
> pre-configure:
>        ${CP} ${WRKSRC}/MakeFiles/FreeBSD/Makefile ${WRKSRC}
>
> pre-patch:
>-       ${REINPLACE_CMD} -e "s@../../@@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
>+       ${REINPLACE_CMD} -e "s@\.\./\.\./@@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
>
> do-install:
>-       ${INSTALL_PROGRAM} ${WRKSRC}/rntrack ${PREFIX}/sbin
>-       ${MKDIR} ${PREFIX}/etc/rntrack/tpl
>-       ${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${PREFIX}/etc/rntrack/rntrack.cfg-dist
>-       ${INSTALL_DATA} ${WRKSRC}/samples/test.pl ${PREFIX}/etc/rntrack
>-       ${INSTALL_DATA} ${WRKSRC}/doc/rntrack.1 ${PREFIX}/man/man1
>-       ${INSTALL_DATA} ${WRKSRC}/samples/tpl/* ${PREFIX}/etc/rntrack/tpl
>-       ${MKDIR} ${PREFIX}/etc/rntrack/tbl
>+       ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/rntrack
>+       ${INSTALL_PROGRAM} ${WRKSRC}/rntrack ${STAGEDIR}${PREFIX}/sbin
>+       ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tpl
>+       ${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${STAGEDIR}${PREFIX}/etc/fido/rntrack/rntrack.cfg-dist
>+       ${INSTALL_DATA} ${WRKSRC}/samples/test.pl ${STAGEDIR}${PREFIX}/etc/fido/rntrack
>+       ${INSTALL_DATA} ${WRKSRC}/samples/tpl/* ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tpl
>+       ${INSTALL_DATA} ${WRKSRC}/doc/rntrack.1 ${STAGEDIR}${PREFIX}/man/man1
>+       ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tbl
> .for f in alt2koi.tbl koi2alt.tbl
>-       ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${PREFIX}/etc/rntrack/tbl
>+       ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tbl
> .endfor
>-.if !defined(NOPORTDOCS)
>+.if !defined(DOCS)
>        ${MKDIR} ${DOCSDIR}
> .for f in ${PORTDOCS}
>        ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
>diff -ruN ./rntrack-back/distinfo ./rntrack/distinfo
>--- ./rntrack-back/distinfo     2016-02-20 23:45:52.000000000 +0300
>+++ ./rntrack/distinfo  2020-02-06 12:04:56.703148000 +0300
>@@ -1,2 +1,3 @@
>-SHA256 (rntrack-1.12.tar.gz) = 214da6360c5f01b8f5bb168e1bbca80857001b1d12e0798b4ce421035173e976
>-SIZE (rntrack-1.12.tar.gz) = 475753
>+TIMESTAMP = 1580979896
>+SHA256 (rntrack-2_0_15-src.tar.bz2) = f3632b6d93d22c5dac5ed923369060a54e241ed688e802cdb8c7cedf1a61e5e4
>+SIZE (rntrack-2_0_15-src.tar.bz2) = 1382449
>diff -ruN ./rntrack-back/pkg-descr ./rntrack/pkg-descr
>--- ./rntrack-back/pkg-descr    2009-10-23 17:46:06.000000000 +0400
>+++ ./rntrack/pkg-descr 2020-02-02 15:54:57.724095000 +0300
>@@ -4,7 +4,7 @@
> It is so called netmail "tracker". It's puprose is to process netmail on
> netmail hubs, though it can be useful for an ordinary node.
>
>-How does it work,
>+How does it work,
> It takes a letter, compares it with a mask and, if comparison was
> successful, it executes corresponding operation with this letter.
>
>diff -ruN ./rntrack-back/pkg-plist ./rntrack/pkg-plist
>--- ./rntrack-back/pkg-plist    2009-10-23 17:46:06.000000000 +0400
>+++ ./rntrack/pkg-plist 2020-02-06 13:10:09.639531000 +0300
>@@ -1,12 +1,13 @@
>-etc/rntrack/rntrack.cfg-dist
>-etc/rntrack/test.pl
>-etc/rntrack/tbl/alt2koi.tbl
>-etc/rntrack/tbl/koi2alt.tbl
>-etc/rntrack/tpl/audit.tpl
>-etc/rntrack/tpl/badfrom.tpl
>-etc/rntrack/tpl/badto.tpl
>-etc/rntrack/tpl/loop.tpl
>+etc/fido/rntrack/rntrack.cfg-dist
>+etc/fido/rntrack/test.pl
>+etc/fido/rntrack/tbl/alt2koi.tbl
>+etc/fido/rntrack/tbl/koi2alt.tbl
>+etc/fido/rntrack/tpl/audit.tpl
>+etc/fido/rntrack/tpl/badfrom.tpl
>+etc/fido/rntrack/tpl/badto.tpl
>+etc/fido/rntrack/tpl/loop.tpl
> sbin/rntrack
>-@dirrm etc/rntrack/tbl
>-@dirrm etc/rntrack/tpl
>-@dirrm etc/rntrack
>+man/man1/rntrack.1.gz
>+@dir etc/fido/rntrack/tbl
>+@dir etc/fido/rntrack/tpl
>+@dir etc/fido/rntrack

Actions: View | Diff

Attachments on bug 244080: 211598