Attachment #48984 for bug #74932

View | Details | Raw Unified | Return to bug 74932
Collapse All | Expand All




#

PORTNAME=		fidogate
PORTVERSION=		5.1.2
PORTREVISION=		1
CATEGORIES=		news mail
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	rusfidogate

			--with-btbasedir=${BTBASEDIR}
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

DOCS=		doc/README.ru doc/README doc/FAQ.ru doc/FIDOGATE+tracker.ru \
		ChangeLog Changes.ru doc/old/FAQ_fidogate \
		doc/old/FIDOGATE_ftrack doc/old/README.snp \
		doc/old/fidogate.txt doc/old/fidogate.texi doc/old/msgid.doc

.if !defined(NOPORTDOCS)

Lines 1-2 Link Here

(-)fidogate-ds/distinfo (-2 / +2 lines)
1	MD5 (fidogate5.1.1ds.tar.bz2) = 19945a10a9bd543a642c300fe1501441	1	MD5 (fidogate5.1.2ds.tar.bz2) = aa25623409294450d8877a50f4b22a03
2	SIZE (fidogate5.1.1ds.tar.bz2) = 700765	2	SIZE (fidogate5.1.2ds.tar.bz2) = 693556




--- src/common/log.c.old	Sat Aug 21 17:21:16 2004
+++ src/common/log.c	Sat Aug 21 17:21:24 2004
@@ -276,9 +276,4 @@
     char *p;
     
     BUF_COPY(logprog, name);
-
-    if( (p = getenv("LOGFILE")) )
-       log_file(p);
-    if( (p = getenv("FIDOGATE_LOGFILE")) )
-       log_file(p);
 }




--- src/toss/ngoper.c.old	Wed Jul 14 16:13:34 2004
+++ src/toss/ngoper.c	Sat Jul 10 17:34:20 2004
@@ -20,7 +20,7 @@
   int   c;
   int   option_index;
   int   remove;
-  char *cmd_ng, *cmd_rn, *cmd_rm;
+  char *cmd_ng, *cmd_rn = NULL, *cmd_rm;
   char *c_flag=NULL;
   char *p;
   char  buf[BUFSIZ];
@@ -106,12 +106,6 @@
       debug(8, "config: AutoCreateRenumberCmd %s", p);
       cmd_rn = p;
     }
-  else
-    {
-      printf("config: parameter `AutoCreateRenumberCmd' not defined!\n");
-      exit_free();
-      exit(1);
-    }
 
   /* AutoCreateRmgroupCmd */
   if (NULL != (p = cf_get_string("AutoCreateRmgroupCmd", TRUE)))
@@ -136,9 +130,12 @@
       if (0 != run_system(buf))
 	return 1;
 
-      str_printf(buf, sizeof(buf), cmd_rn, argv[optind+1]);
-      if (0 != run_system(buf))
-	return 1;
+      if (cmd_rn)
+      {
+        str_printf(buf, sizeof(buf), cmd_rn, argv[optind+1]);
+        if (0 != run_system(buf))
+	    return 1;
+      }
     }
   else
     {

Lines 1-10 Link Here

(-)fidogate-ds/files/patch-send-fidogate.in (-10 lines)
1	--- src/gate/send-fidogate.in.old Wed Jul 14 16:10:57 2004
2	+++ src/gate/send-fidogate.in Wed Jul 14 16:11:10 2004
3	@@ -10,7 +10,6 @@
4	export FIDOGATE_LOGFILE
5
6	eval `<NEWSBINDIR>/innconfval -s`
7	-eval `<LIBEXECDIR>/confval`
8
9	RFC2FTN=<SEND_RFC2FTN>
10	PROGNAME=`basename $0`

Lines 56-61 Link Here

(-)fidogate-ds/pkg-plist (+2 lines)
56	etc/fido/gate/routing.sample	56	etc/fido/gate/routing.sample
57	etc/fido/gate/spyes.sample	57	etc/fido/gate/spyes.sample
58	etc/fido/gate/uplinks.sample	58	etc/fido/gate/uplinks.sample
		59	libexec/fidogate/charsetc
59	libexec/fidogate/charset.bin	60	libexec/fidogate/charset.bin
60	libexec/fidogate/confval	61	libexec/fidogate/confval
61	libexec/fidogate/ftn2ftn	62	libexec/fidogate/ftn2ftn
Lines 79-84 Link Here
79	var/fidogate/fareas.bbs.sample	80	var/fidogate/fareas.bbs.sample
80	%%PORTDOCS%%%%DOCSDIR%%/README.ru	81	%%PORTDOCS%%%%DOCSDIR%%/README.ru
81	%%PORTDOCS%%%%DOCSDIR%%/FAQ.ru	82	%%PORTDOCS%%%%DOCSDIR%%/FAQ.ru
		83	%%PORTDOCS%%%%DOCSDIR%%/FIDOGATE+tracker.ru
82	%%PORTDOCS%%%%DOCSDIR%%/README	84	%%PORTDOCS%%%%DOCSDIR%%/README
83	%%PORTDOCS%%%%DOCSDIR%%/Changes.ru	85	%%PORTDOCS%%%%DOCSDIR%%/Changes.ru
84	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	86	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog

Return to bug 74932

Lines 5-12 Link Here

(-)fidogate-ds/Makefile (-4 / +4 lines)
5	#	5	#
6		6
7	PORTNAME= fidogate	7	PORTNAME= fidogate
8	PORTVERSION= 5.1.1	8	PORTVERSION= 5.1.2
9	PORTREVISION= 1
10	CATEGORIES= news mail	9	CATEGORIES= news mail
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= rusfidogate	11	MASTER_SITE_SUBDIR= rusfidogate
Lines 75-82 Link Here
75	--with-btbasedir=${BTBASEDIR}	74	--with-btbasedir=${BTBASEDIR}
76	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	75	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
77		76
78	DOCS= doc/README.ru doc/README doc/FAQ.ru ChangeLog Changes.ru \	77	DOCS= doc/README.ru doc/README doc/FAQ.ru doc/FIDOGATE+tracker.ru \
79	doc/old/FAQ_fidogate doc/old/FIDOGATE_ftrack doc/old/README.snp \	78	ChangeLog Changes.ru doc/old/FAQ_fidogate \
		79	doc/old/FIDOGATE_ftrack doc/old/README.snp \
80	doc/old/fidogate.txt doc/old/fidogate.texi doc/old/msgid.doc	80	doc/old/fidogate.txt doc/old/fidogate.texi doc/old/msgid.doc
81		81
82	.if !defined(NOPORTDOCS)	82	.if !defined(NOPORTDOCS)

Lines 1-12 Link Here

(-)fidogate-ds/files/patch-log.c (-12 lines)
1	--- src/common/log.c.old Sat Aug 21 17:21:16 2004
2	+++ src/common/log.c Sat Aug 21 17:21:24 2004
3	@@ -276,9 +276,4 @@
4	char *p;
5
6	BUF_COPY(logprog, name);
7	-
8	- if( (p = getenv("LOGFILE")) )
9	- log_file(p);
10	- if( (p = getenv("FIDOGATE_LOGFILE")) )
11	- log_file(p);
12	}

Lines 1-40 Link Here

(-)fidogate-ds/files/patch-ngoper.c (-40 lines)
1	--- src/toss/ngoper.c.old Wed Jul 14 16:13:34 2004
2	+++ src/toss/ngoper.c Sat Jul 10 17:34:20 2004
3	@@ -20,7 +20,7 @@
4	int c;
5	int option_index;
6	int remove;
7	- char cmd_ng, cmd_rn, *cmd_rm;
8	+ char cmd_ng, cmd_rn = NULL, *cmd_rm;
9	char *c_flag=NULL;
10	char *p;
11	char buf[BUFSIZ];
12	@@ -106,12 +106,6 @@
13	debug(8, "config: AutoCreateRenumberCmd %s", p);
14	cmd_rn = p;
15	}
16	- else
17	- {
18	- printf("config: parameter `AutoCreateRenumberCmd' not defined!\n");
19	- exit_free();
20	- exit(1);
21	- }
22
23	/* AutoCreateRmgroupCmd */
24	if (NULL != (p = cf_get_string("AutoCreateRmgroupCmd", TRUE)))
25	@@ -136,9 +130,12 @@
26	if (0 != run_system(buf))
27	return 1;
28
29	- str_printf(buf, sizeof(buf), cmd_rn, argv[optind+1]);
30	- if (0 != run_system(buf))
31	- return 1;
32	+ if (cmd_rn)
33	+ {
34	+ str_printf(buf, sizeof(buf), cmd_rn, argv[optind+1]);
35	+ if (0 != run_system(buf))
36	+ return 1;
37	+ }
38	}
39	else
40	{