Attachment #5652 for bug #13370

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

Lines 6-11 Link Here

(-)elm/Makefile (-4 / +10 lines)
6	#	6	#
7	# $Id: Makefile,v 1.53 1999/08/22 23:32:58 mharo Exp $	7	# $Id: Makefile,v 1.52 1999/04/07 18:28:33 ache Exp $
8	#	8	#
9		9
10	DISTNAME= elm-2.4ME+54	10	DISTNAME= elm-2.4ME+60
11	CATEGORIES= mail	11	CATEGORIES= mail
Lines 17-19 Link Here
17		17
18	WRKSRC= ${WRKDIR}/elm2.4.ME+.54	18	WRKSRC= ${WRKDIR}/elm2.4.ME+.60
19	MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \	19	MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
Lines 28-34 Link Here
28		28
		29
		30	PLIST_SUB+= LIBELMUTIL="${LIBELMUTIL}"
		31
29	post-configure:	32	post-configure:
30	${CP} ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin	33	${CP} ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
		34	${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}/lib
31		35
32	post-install:	36	post-install:
33	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS	37	${PERL} -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
34	cd ${WRKSRC}/nls; ${MAKE} install	38	cd ${WRKSRC}/nls; ${MAKE} install
Line 43 Link Here
43	.include <bsd.port.mk>	47	.include <bsd.port.mk>
		48
		49	LIBELMUTIL!= ${MAKE} -f ${FILESDIR}/Makefile.bsd JUST_WONDERING=Y printname





SRCS=	${LIB_SRC}
LIB=	elmutil
SHLIB_MAJOR=	1
SHLIB_MINOR=	0
INTERNALLIB=	True

all: ${SHLIB_NAME}

install: ${SHLIB_NAME}
	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
		${INSTALLFLAGS} ${SHLINSTALLFLAGS} ${SHLIB_NAME} \
		${PREFIX}/lib

printname:
	@echo ${SHLIB_NAME}

.if !defined(JUST_WONDERING)
.include "Makefile"
.endif

.include <bsd.lib.mk>

# The 3.*'s bsd.lib.mk defines SHLIB_NAME. If it's not defined -- we are
# on an old, aout system:
SHLIB_NAME?=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}

Line 1 Link Here

(-)elm/files/md5 (-1 / +1 lines)
1	MD5 (elm-2.4ME+54.tar.gz) = 189b1bd3ed6f1c8c0e8a116a201ab49e	1	MD5 (elm-2.4ME+60.tar.gz) = 4bf2f6711327d8f3f69305f0aad1544f

Line 0 Link Here

(-)elm/patches/patch-ad (+9 lines)
	1	--- src/Makefile.SH.orig Wed May 26 06:29:50 1999
	2	+++ src/Makefile.SH Tue Aug 24 22:19:54 1999
	3	@@ -336,4 +336,4 @@
	4	# Dependencies and rules for compiling C programs
	5	-$(BIN)/elm: $& $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a
	6	- $(CC) $(LFLAGS) -o $@ $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a $(LIBS) $(LIB2)
	7	+$(BIN)/elm: $& $(ELM_OBJ) ../melib/libme.a
	8	+ $(CC) $(LFLAGS) -o $@ $(ELM_OBJ) ../melib/libme.a -L../lib -lelmutil $(LIBS) $(LIB2)
	9




--- utils/Makefile.SH.orig	Wed May 26 06:29:51 1999
+++ utils/Makefile.SH	Tue Aug 24 22:22:38 1999
@@ -211,3 +211,3 @@
 .PRECIOUS:		$(INCLDIR)/defs.h $(INCLDIR)/elm.h \
-			$(INCLDIR)/headers.h ../lib/libutil.a
+			$(INCLDIR)/headers.h
 
@@ -218,4 +218,4 @@
 
-$(BIN)/answer:		$(ANSWER_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(ANSWER_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/answer:		$(ANSWER_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(ANSWER_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -224,4 +224,4 @@
 
-$(BIN)/elmalias:	$(ELMALIAS_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(ELMALIAS_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/elmalias:	$(ELMALIAS_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(ELMALIAS_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -230,4 +230,4 @@
 
-$(BIN)/fastmail:	$(FASTMAIL_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(FASTMAIL_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/fastmail:	$(FASTMAIL_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(FASTMAIL_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -236,4 +236,4 @@
 
-$(BIN)/frm:		$(FRM_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(FRM_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/frm:		$(FRM_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(FRM_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -242,4 +242,4 @@
 
-$(BIN)/newalias:	$(NEWALIAS_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(NEWALIAS_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/newalias:	$(NEWALIAS_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(NEWALIAS_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -248,4 +248,4 @@
 
-$(BIN)/newmail:		$(NEWMAIL_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(NEWMAIL_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/newmail:		$(NEWMAIL_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(NEWMAIL_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -254,4 +254,4 @@
 
-$(BIN)/readmsg:		$(READMSG_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(READMSG_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/readmsg:		$(READMSG_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(READMSG_OBJ) -L../lib -lelmutil $(LIB2)
 
@@ -260,4 +260,4 @@
 
-$(BIN)/prlong:		$(PRLONG_OBJ) ../lib/libutil.a
-			$(CC) $(LFLAGS) -o $@ $(PRLONG_OBJ) ../lib/libutil.a $(LIB2)
+$(BIN)/prlong:		$(PRLONG_OBJ)
+			$(CC) $(LFLAGS) -o $@ $(PRLONG_OBJ) -L../lib -lelmutil $(LIB2)
 

Line 0 Link Here

(-)elm/patches/patch-af (+7 lines)
	1	--- filter/Makefile.SH.orig Wed May 26 06:29:47 1999
	2	+++ filter/Makefile.SH Tue Aug 24 22:30:45 1999
	3	@@ -155,3 +155,3 @@
	4	$(BIN)/filter: $& $(FILTER_OBJ)
	5	- $(CC) $(LFLAGS) -o $@ $(FILTER_OBJ) ../lib/libutil.a $(LIB2)
	6	+ $(CC) $(LFLAGS) -o $@ $(FILTER_OBJ) -L../lib -lelmutil $(LIB2)
	7

Line 0 Link Here

(-)elm/patches/patch-ah (+7 lines)
	1	--- Makefile.SH.orig Wed May 26 06:29:46 1999
	2	+++ Makefile.SH Tue Aug 24 23:00:22 1999
	3	@@ -57,3 +57,3 @@
	4	cd melib; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
	5	- cd lib; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
	6	+ cd lib; $(MAKE) $(MJ) -$(MAKEFLAGS) -f Makefile.bsd $@
	7	cd src; $(MAKE) $(MJ) -$(MAKEFLAGS) $@

Line 0 Link Here

(-)elm/patches/patch-ai (+10 lines)
	1	--- lib/Makefile.SH.orig Wed May 26 06:29:48 1999
	2	+++ lib/Makefile.SH Tue Aug 24 23:09:47 1999
	3	@@ -208,5 +208,5 @@
	4
	5	-all: Makefile libutil.a
	6	+all: Makefile # libutil.a
	7
	8	-install: Makefile libutil.a
	9	+install: Makefile # libutil.a
	10




--- lib/mk_aliases.c.orig	Wed May 26 06:29:49 1999
+++ lib/mk_aliases.c	Tue Aug 24 23:57:11 1999
@@ -48,4 +48,2 @@
 
-extern int  is_system;		/* system file updating?     */
-
 #ifdef DEBUG
@@ -226,5 +224,6 @@
 
-void add_to_table(data, aliases, lastn, firstn, comment, addresses)
+void add_to_table(data, aliases, lastn, firstn, comment, addresses, is_system)
      FILE *data;
      char *aliases, *lastn, *firstn, *comment, *addresses;
+     int is_system;
 {
@@ -389,3 +388,3 @@
 
-void put_alias(data)
+void put_alias(data, is_system)
      FILE *data;
@@ -551,3 +550,3 @@
 
-	add_to_table(data, aliases, lastn, firstn, comment, addresses);
+	add_to_table(data, aliases, lastn, firstn, comment, addresses, is_system);
 }
@@ -556,5 +555,5 @@
 
-int do_newalias(inputname, dataname, fromelm, textwarn)
+int do_newalias(inputname, dataname, fromelm, textwarn, is_system)
      char *inputname, *dataname;
-     int fromelm, textwarn;
+     int fromelm, textwarn, is_system;
 {
@@ -569,3 +568,3 @@
 	    if ((buffer = malloc(2 * VERY_LONG_STRING)) == NULL) {
-	        error(catgets(elm_msg_cat, NewaliasSet, NewaliasNoAlloc,
+	        lib_error(CATGETS(elm_msg_cat, NewaliasSet, NewaliasNoAlloc,
 	                "Unable to allocate space for alias buffer!"));
@@ -619,3 +618,3 @@
 	while (get_alias(in, fromelm) != -1) {
-	    put_alias(data);
+	    put_alias(data, is_system);
 	    if (err_flag) break;
@@ -626,3 +625,3 @@
 		sleep(sleepmsg);
-	    error(catgets(elm_msg_cat, NewaliasSet, NewaliasNoSave,
+	    lib_error(CATGETS(elm_msg_cat, NewaliasSet, NewaliasNoSave,
 	            "** Not saving tables!  Please fix and re-run!"));




--- hdrs/elmlib.h.orig	Wed May 26 06:29:47 1999
+++ hdrs/elmlib.h	Tue Aug 24 23:46:19 1999
@@ -41,7 +41,7 @@
 extern void add_to_table     P_((FILE *,char *, char *, char *, 
-				 char *, char *));
+				 char *, char *, int));
 extern int check_alias       P_((char *));
 extern int check_address     P_((char *));
-extern void put_alias        P_((FILE *));
-extern int do_newalias       P_((char *, char *,int, int));
+extern void put_alias        P_((FILE *, int));
+extern int do_newalias       P_((char *, char *,int, int, int));
 

Line 0 Link Here

(-)elm/patches/patch-am (+7 lines)
	1	--- utils/newalias.c.orig Wed May 26 06:29:51 1999
	2	+++ utils/newalias.c Tue Aug 24 23:48:14 1999
	3	@@ -94,3 +94,3 @@
	4
	5	- if ((a = do_newalias(inputname, dataname, FALSE, TRUE)) < 0) {
	6	+ if ((a = do_newalias(inputname, dataname, FALSE, TRUE, is_system)) < 0) {
	7	exit(1);




--- src/alias.c.orig	Wed May 26 06:29:50 1999
+++ src/alias.c	Wed Aug 25 00:01:56 1999
@@ -55,4 +55,2 @@
 
-int  is_system=0;		/* system file updating?     */
-
 extern int errno;
@@ -1222,3 +1220,3 @@
 
-	na = do_newalias(itextfile, odatafile, TRUE, FALSE);
+	na = do_newalias(itextfile, odatafile, TRUE, FALSE, FALSE);
 	if (na >= 0) {

Lines 6-7 Link Here

(-)elm/pkg/PLIST (+1 lines)
6	bin/frm	6	bin/frm
		7	lib/%%LIBELMUTIL%%
7	@exec ln -f %D/%F %D/bin/nfrm	8	@exec ln -f %D/%F %D/bin/nfrm

Lines 26-29 Link Here

(-)elm/scripts/pre-configure (-2 / +11 lines)
26	d_poll='define'	26	d_poll='define'
27	d_inttypes='define'	27	case `uname -r` in
28	d_nointtypes='undef'	28	2*)
		29	d_inttypes='undef'
		30	d_nointtypes='define'
		31	;;
		32	3\|4)
		33	d_inttypes='define'
		34	d_nointtypes='undef'
		35	;;
		36	esac
		37	d_mmap='define'
29	n='-n'	38	n='-n'

Return to bug 13370

Line 0 Link Here

(-)elm/files/Makefile.bsd (+26 lines)
	1
	2	SRCS= ${LIB_SRC}
	3	LIB= elmutil
	4	SHLIB_MAJOR= 1
	5	SHLIB_MINOR= 0
	6	INTERNALLIB= True
	7
	8	all: ${SHLIB_NAME}
	9
	10	install: ${SHLIB_NAME}
	11	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	12	${INSTALLFLAGS} ${SHLINSTALLFLAGS} ${SHLIB_NAME} \
	13	${PREFIX}/lib
	14
	15	printname:
	16	@echo ${SHLIB_NAME}
	17
	18	.if !defined(JUST_WONDERING)
	19	.include "Makefile"
	20	.endif
	21
	22	.include <bsd.lib.mk>
	23
	24	# The 3.*'s bsd.lib.mk defines SHLIB_NAME. If it's not defined -- we are
	25	# on an old, aout system:
	26	SHLIB_NAME?=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}

Line 0 Link Here

(-)elm/patches/patch-ae (+63 lines)
	1	--- utils/Makefile.SH.orig Wed May 26 06:29:51 1999
	2	+++ utils/Makefile.SH Tue Aug 24 22:22:38 1999
	3	@@ -211,3 +211,3 @@
	4	.PRECIOUS: $(INCLDIR)/defs.h $(INCLDIR)/elm.h \
	5	- $(INCLDIR)/headers.h ../lib/libutil.a
	6	+ $(INCLDIR)/headers.h
	7
	8	@@ -218,4 +218,4 @@
	9
	10	-$(BIN)/answer: $(ANSWER_OBJ) ../lib/libutil.a
	11	- $(CC) $(LFLAGS) -o $@ $(ANSWER_OBJ) ../lib/libutil.a $(LIB2)
	12	+$(BIN)/answer: $(ANSWER_OBJ)
	13	+ $(CC) $(LFLAGS) -o $@ $(ANSWER_OBJ) -L../lib -lelmutil $(LIB2)
	14
	15	@@ -224,4 +224,4 @@
	16
	17	-$(BIN)/elmalias: $(ELMALIAS_OBJ) ../lib/libutil.a
	18	- $(CC) $(LFLAGS) -o $@ $(ELMALIAS_OBJ) ../lib/libutil.a $(LIB2)
	19	+$(BIN)/elmalias: $(ELMALIAS_OBJ)
	20	+ $(CC) $(LFLAGS) -o $@ $(ELMALIAS_OBJ) -L../lib -lelmutil $(LIB2)
	21
	22	@@ -230,4 +230,4 @@
	23
	24	-$(BIN)/fastmail: $(FASTMAIL_OBJ) ../lib/libutil.a
	25	- $(CC) $(LFLAGS) -o $@ $(FASTMAIL_OBJ) ../lib/libutil.a $(LIB2)
	26	+$(BIN)/fastmail: $(FASTMAIL_OBJ)
	27	+ $(CC) $(LFLAGS) -o $@ $(FASTMAIL_OBJ) -L../lib -lelmutil $(LIB2)
	28
	29	@@ -236,4 +236,4 @@
	30
	31	-$(BIN)/frm: $(FRM_OBJ) ../lib/libutil.a
	32	- $(CC) $(LFLAGS) -o $@ $(FRM_OBJ) ../lib/libutil.a $(LIB2)
	33	+$(BIN)/frm: $(FRM_OBJ)
	34	+ $(CC) $(LFLAGS) -o $@ $(FRM_OBJ) -L../lib -lelmutil $(LIB2)
	35
	36	@@ -242,4 +242,4 @@
	37
	38	-$(BIN)/newalias: $(NEWALIAS_OBJ) ../lib/libutil.a
	39	- $(CC) $(LFLAGS) -o $@ $(NEWALIAS_OBJ) ../lib/libutil.a $(LIB2)
	40	+$(BIN)/newalias: $(NEWALIAS_OBJ)
	41	+ $(CC) $(LFLAGS) -o $@ $(NEWALIAS_OBJ) -L../lib -lelmutil $(LIB2)
	42
	43	@@ -248,4 +248,4 @@
	44
	45	-$(BIN)/newmail: $(NEWMAIL_OBJ) ../lib/libutil.a
	46	- $(CC) $(LFLAGS) -o $@ $(NEWMAIL_OBJ) ../lib/libutil.a $(LIB2)
	47	+$(BIN)/newmail: $(NEWMAIL_OBJ)
	48	+ $(CC) $(LFLAGS) -o $@ $(NEWMAIL_OBJ) -L../lib -lelmutil $(LIB2)
	49
	50	@@ -254,4 +254,4 @@
	51
	52	-$(BIN)/readmsg: $(READMSG_OBJ) ../lib/libutil.a
	53	- $(CC) $(LFLAGS) -o $@ $(READMSG_OBJ) ../lib/libutil.a $(LIB2)
	54	+$(BIN)/readmsg: $(READMSG_OBJ)
	55	+ $(CC) $(LFLAGS) -o $@ $(READMSG_OBJ) -L../lib -lelmutil $(LIB2)
	56
	57	@@ -260,4 +260,4 @@
	58
	59	-$(BIN)/prlong: $(PRLONG_OBJ) ../lib/libutil.a
	60	- $(CC) $(LFLAGS) -o $@ $(PRLONG_OBJ) ../lib/libutil.a $(LIB2)
	61	+$(BIN)/prlong: $(PRLONG_OBJ)
	62	+ $(CC) $(LFLAGS) -o $@ $(PRLONG_OBJ) -L../lib -lelmutil $(LIB2)
	63

Line 0 Link Here

(-)elm/patches/patch-ak (+48 lines)
	1	--- lib/mk_aliases.c.orig Wed May 26 06:29:49 1999
	2	+++ lib/mk_aliases.c Tue Aug 24 23:57:11 1999
	3	@@ -48,4 +48,2 @@
	4
	5	-extern int is_system; /* system file updating? */
	6	-
	7	#ifdef DEBUG
	8	@@ -226,5 +224,6 @@
	9
	10	-void add_to_table(data, aliases, lastn, firstn, comment, addresses)
	11	+void add_to_table(data, aliases, lastn, firstn, comment, addresses, is_system)
	12	FILE *data;
	13	char aliases, lastn, firstn, comment, *addresses;
	14	+ int is_system;
	15	{
	16	@@ -389,3 +388,3 @@
	17
	18	-void put_alias(data)
	19	+void put_alias(data, is_system)
	20	FILE *data;
	21	@@ -551,3 +550,3 @@
	22
	23	- add_to_table(data, aliases, lastn, firstn, comment, addresses);
	24	+ add_to_table(data, aliases, lastn, firstn, comment, addresses, is_system);
	25	}
	26	@@ -556,5 +555,5 @@
	27
	28	-int do_newalias(inputname, dataname, fromelm, textwarn)
	29	+int do_newalias(inputname, dataname, fromelm, textwarn, is_system)
	30	char inputname, dataname;
	31	- int fromelm, textwarn;
	32	+ int fromelm, textwarn, is_system;
	33	{
	34	@@ -569,3 +568,3 @@
	35	if ((buffer = malloc(2 * VERY_LONG_STRING)) == NULL) {
	36	- error(catgets(elm_msg_cat, NewaliasSet, NewaliasNoAlloc,
	37	+ lib_error(CATGETS(elm_msg_cat, NewaliasSet, NewaliasNoAlloc,
	38	"Unable to allocate space for alias buffer!"));
	39	@@ -619,3 +618,3 @@
	40	while (get_alias(in, fromelm) != -1) {
	41	- put_alias(data);
	42	+ put_alias(data, is_system);
	43	if (err_flag) break;
	44	@@ -626,3 +625,3 @@
	45	sleep(sleepmsg);
	46	- error(catgets(elm_msg_cat, NewaliasSet, NewaliasNoSave,
	47	+ lib_error(CATGETS(elm_msg_cat, NewaliasSet, NewaliasNoSave,
	48	"** Not saving tables! Please fix and re-run!"));

Line 0 Link Here

(-)elm/patches/patch-al (+13 lines)
	1	--- hdrs/elmlib.h.orig Wed May 26 06:29:47 1999
	2	+++ hdrs/elmlib.h Tue Aug 24 23:46:19 1999
	3	@@ -41,7 +41,7 @@
	4	extern void add_to_table P_((FILE ,char , char , char ,
	5	- char , char ));
	6	+ char , char , int));
	7	extern int check_alias P_((char *));
	8	extern int check_address P_((char *));
	9	-extern void put_alias P_((FILE *));
	10	-extern int do_newalias P_((char , char ,int, int));
	11	+extern void put_alias P_((FILE *, int));
	12	+extern int do_newalias P_((char , char ,int, int, int));
	13

Line 0 Link Here

(-)elm/patches/patch-an (+12 lines)
	1	--- src/alias.c.orig Wed May 26 06:29:50 1999
	2	+++ src/alias.c Wed Aug 25 00:01:56 1999
	3	@@ -55,4 +55,2 @@
	4
	5	-int is_system=0; /* system file updating? */
	6	-
	7	extern int errno;
	8	@@ -1222,3 +1220,3 @@
	9
	10	- na = do_newalias(itextfile, odatafile, TRUE, FALSE);
	11	+ na = do_newalias(itextfile, odatafile, TRUE, FALSE, FALSE);
	12	if (na >= 0) {