Attachment #108046 for bug #148859

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

Lines 7-13 Link Here

(-)alpine/Makefile (-3 / +7 lines)
7		7
8	PORTNAME?= alpine	8	PORTNAME?= alpine
9	PORTVERSION= 2.00	9	PORTVERSION= 2.00
10	PORTREVISION?= 1	10	PORTREVISION?= 2
11	CATEGORIES?= mail news ipv6	11	CATEGORIES?= mail news ipv6
12	MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ \	12	MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ \
13	http://dougbarton.us/Downloads/alpine-${PORTVERSION}/	13	http://dougbarton.us/Downloads/alpine-${PORTVERSION}/
Lines 182-189 Link Here
182	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${DOCSDIR}	182	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${DOCSDIR}
183	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes/*.html ${DOCSDIR}/tech-notes	183	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes/*.html ${DOCSDIR}/tech-notes
184	.endif	184	.endif
185	${PREFIX}/bin/alpine -P ${PREFIX}/etc/alpine.conf -conf >${WRKSRC}/alpine.conf	185	${PREFIX}/bin/alpine -P /dev/null -conf >${WRKSRC}/alpine.conf.sample
186	${INSTALL_DATA} ${WRKSRC}/alpine.conf ${PREFIX}/etc/alpine.conf	186	${INSTALL_DATA} ${WRKSRC}/alpine.conf.sample \
		187	${PREFIX}/etc/alpine.conf.sample
		188	@if [ ! -f ${PREFIX}/etc/alpine.conf ]; then \
		189	${CP} -p ${PREFIX}/etc/alpine.conf.sample \
		190	${PREFIX}/etc/alpine.conf; fi
187		191
188	@${CAT} ${PKGMESSAGE}	192	@${CAT} ${PKGMESSAGE}
189	.endif # !defined(PICO_ALPINE_SLAVE)	193	.endif # !defined(PICO_ALPINE_SLAVE)




--- alpine/arg.c.orig	2010-07-22 16:47:48.668603132 +0000
+++ alpine/arg.c	2010-07-22 16:56:39.038755763 +0000
@@ -839,8 +839,12 @@
 	exit(0);
     }
 
-    if(do_conf)
-      dump_global_conf();
+    if(do_conf) {
+      if(pine_state->pconf)
+        dump_global_conf(pine_state->pconf->name);
+      else
+        dump_global_conf(SYSTEM_PINERC);
+    }
 
     if(pinerc_file)
       dump_new_pinerc(pinerc_file);
--- pith/conf.c.orig	2010-07-22 16:45:34.449756882 +0000
+++ pith/conf.c	2010-07-22 17:06:36.641670938 +0000
@@ -6028,16 +6028,16 @@
 
 /*------------------------------------------------------------
     Dump out a global pine.conf on the standard output with fresh
-    comments.  Preserves variables currently set in SYSTEM_PINERC, if any.
+    comments.  Preserves variables currently set in refPrc, if any.
   ----*/
 void
-dump_global_conf(void)
+dump_global_conf(char *refPrc)
 {
      FILE            *f;
      struct variable *var;
      PINERC_S        *prc;
 
-     prc = new_pinerc_s(SYSTEM_PINERC);
+     prc = new_pinerc_s(refPrc);
      read_pinerc(prc, variables, ParseGlobal);
      if(prc)
        free_pinerc_s(&prc);
--- pith/conf.h.orig	2010-07-22 17:09:08.101585257 +0000
+++ pith/conf.h	2010-07-22 17:09:26.156839207 +0000
@@ -853,7 +853,7 @@
 int        write_pinerc(struct pine *, EditWhich, int);
 void       quit_to_edit_msg(PINERC_S *);
 int        var_in_pinerc(char *);
-void       dump_global_conf(void);
+void       dump_global_conf(char *);
 void       dump_new_pinerc(char *);
 int        set_variable(int, char *, int, int, EditWhich);
 int        set_variable_list(int, char **, int, EditWhich);
--- doc/alpine.1.orig	2008-08-22 20:40:16.000000000 +0000
+++ doc/alpine.1	2010-07-23 06:02:09.000000000 +0000
@@ -111,12 +111,13 @@
 .I -f
 argument is applied to the first defined folder-collection.
 .IP \fB-conf\fR 20
-Produce a sample/fresh copy of the 
-system-wide configuration file,
+Produce a copy of the system-wide configuration file,
 .I pine.conf,
-on the standard output. This is distinct from the per-user
+with fresh comments on the standard output.
+This is distinct from the per-user
 .I .pinerc
-file.
+file and will preserve variables currently set in the default
+system-wide configuration file (or the file specified with -P, if any).
 .IP \fB-convert_sigs\ \fI-p\ pinerc\fR 20
 Convert signature files into literal signatures.
 .IP \fB-copy_abook\ <\fIlocal_abook\fR>\ <\fIremote_abook\fR> 20

Lines 1-11 Link Here

(-)alpine/pkg-plist (-5 / +3 lines)
1	@unexec %D/bin/alpine -conf >%D/etc/alpine.conf.tmp	1	@unexec if cmp -s %D/etc/alpine.conf.sample %D/etc/alpine.conf; then rm -f %D/etc/alpine.conf; fi
2	@unexec if cmp -s %D/etc/alpine.conf %D/etc/alpine.conf.tmp; then rm -f %D/etc/alpine.conf; fi	2	etc/alpine.conf.sample
3	@unexec rm -f %D/etc/alpine.conf.tmp	3	@exec if [ ! -f %D/etc/alpine.conf ]; then cp -p %D/%F %B/alpine.conf; fi
4	bin/alpine	4	bin/alpine
5	bin/rpdump	5	bin/rpdump
6	bin/rpload	6	bin/rpload
7	@exec %D/bin/alpine -P %D/etc/alpine.conf -conf >%D/etc/alpine.conf.tmp
8	@exec /bin/mv %D/etc/alpine.conf.tmp %D/etc/alpine.conf
9	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	7	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
10	%%PORTDOCS%%%%DOCSDIR%%/NOTICE	8	%%PORTDOCS%%%%DOCSDIR%%/NOTICE
11	%%PORTDOCS%%%%DOCSDIR%%/README	9	%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 148859

Line 0 Link Here

(-)alpine/files/patch-alpine-conf-option (+70 lines)
		1	--- alpine/arg.c.orig 2010-07-22 16:47:48.668603132 +0000
		2	+++ alpine/arg.c 2010-07-22 16:56:39.038755763 +0000
		3	@@ -839,8 +839,12 @@
		4	exit(0);
		5	}
		6
		7	- if(do_conf)
		8	- dump_global_conf();
		9	+ if(do_conf) {
		10	+ if(pine_state->pconf)
		11	+ dump_global_conf(pine_state->pconf->name);
		12	+ else
		13	+ dump_global_conf(SYSTEM_PINERC);
		14	+ }
		15
		16	if(pinerc_file)
		17	dump_new_pinerc(pinerc_file);
		18	--- pith/conf.c.orig 2010-07-22 16:45:34.449756882 +0000
		19	+++ pith/conf.c 2010-07-22 17:06:36.641670938 +0000
		20	@@ -6028,16 +6028,16 @@
		21
		22	/*------------------------------------------------------------
		23	Dump out a global pine.conf on the standard output with fresh
		24	- comments. Preserves variables currently set in SYSTEM_PINERC, if any.
		25	+ comments. Preserves variables currently set in refPrc, if any.
		26	----*/
		27	void
		28	-dump_global_conf(void)
		29	+dump_global_conf(char *refPrc)
		30	{
		31	FILE *f;
		32	struct variable *var;
		33	PINERC_S *prc;
		34
		35	- prc = new_pinerc_s(SYSTEM_PINERC);
		36	+ prc = new_pinerc_s(refPrc);
		37	read_pinerc(prc, variables, ParseGlobal);
		38	if(prc)
		39	free_pinerc_s(&prc);
		40	--- pith/conf.h.orig 2010-07-22 17:09:08.101585257 +0000
		41	+++ pith/conf.h 2010-07-22 17:09:26.156839207 +0000
		42	@@ -853,7 +853,7 @@
		43	int write_pinerc(struct pine *, EditWhich, int);
		44	void quit_to_edit_msg(PINERC_S *);
		45	int var_in_pinerc(char *);
		46	-void dump_global_conf(void);
		47	+void dump_global_conf(char *);
		48	void dump_new_pinerc(char *);
		49	int set_variable(int, char *, int, int, EditWhich);
		50	int set_variable_list(int, char **, int, EditWhich);
		51	--- doc/alpine.1.orig 2008-08-22 20:40:16.000000000 +0000
		52	+++ doc/alpine.1 2010-07-23 06:02:09.000000000 +0000
		53	@@ -111,12 +111,13 @@
		54	.I -f
		55	argument is applied to the first defined folder-collection.
		56	.IP \fB-conf\fR 20
		57	-Produce a sample/fresh copy of the
		58	-system-wide configuration file,
		59	+Produce a copy of the system-wide configuration file,
		60	.I pine.conf,
		61	-on the standard output. This is distinct from the per-user
		62	+with fresh comments on the standard output.
		63	+This is distinct from the per-user
		64	.I .pinerc
65	-file.
66	+file and will preserve variables currently set in the default
67	+system-wide configuration file (or the file specified with -P, if any).
68	.IP \fB-convert_sigs\ \fI-p\ pinerc\fR 20
69	Convert signature files into literal signatures.
70	.IP \fB-copy_abook\ <\fIlocal_abook\fR>\ <\fIremote_abook\fR> 20