Attachment #229185 for bug #259586

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





PORTNAME=	mls
PORTVERSION=	1.3
PORTREVISION=	2
CATEGORIES=	mail
MASTER_SITES=	http://www.marki-online.net/MLS/ \
		http://marki.host.sk/MLS/
EXTRACT_SUFX=	.tgz

MAINTAINER=	fuz@fuz.su
COMMENT=	Program for generating various statistics on emails

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING.gz

USES=		tar:tgz

SUB_FILES=	pkg-message
PLIST_FILES=	bin/mls man/man1/mls.1.gz
PORTDATA=	html/bar.gif html/mls_class.php html/style_mls.css
PORTEXAMPLES=	README example.php forward procmailrc
PORTDOCS=	README.txt

MAKE_ARGS+=	CC="${CC}" CFLAGS="${CFLAGS}"
ALL_TARGET=	mls

OPTIONS_DEFINE=	DOCS EXAMPLES

post-install:
	${MKDIR} ${STAGEDIR}${DATADIR}/html
.for f in ${PORTDATA}
	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}/html/
.endfor

post-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}

post-install-EXAMPLES-on:
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for f in ${PORTEXAMPLES}
	${INSTALL_DATA} ${WRKSRC}/examples/$f ${STAGEDIR}${EXAMPLESDIR}
.endfor

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)b/mail/mls/files/patch-Makefile (-4 / +3 lines)
1	--- Makefile.orig 2003-06-10 22:26:51.000000000 +0200	1	--- Makefile.orig 2003-06-10 20:26:51 UTC
2	+++ Makefile 2014-06-04 13:39:49.442936071 +0200	2	+++ Makefile
3	@@ -5,13 +5,13 @@	3	@@ -5,13 +5,13 @@
4		4
5	# -m386 (486,pentium,pentiumpro)	5	# -m386 (486,pentium,pentiumpro)
Lines 16-22 Link Here
16	CFLAGS=-Wall $(OPTIMIZE) $(DEBUG)	16	CFLAGS=-Wall $(OPTIMIZE) $(DEBUG)
17	LIBS=-lm	17	LIBS=-lm
18	CC=gcc	18	CC=gcc
19	@@ -37,9 +37,9 @@	19	@@ -37,9 +37,8 @@ mls_text.o: mls_text.c mls_text.h mls_lang.h Makefile
20	$(CC) $(CFLAGS) -c mls_text.c -o mls_text.o	20	$(CC) $(CFLAGS) -c mls_text.c -o mls_text.o
21		21
22	install: mls	22	install: mls
Lines 25-31 Link Here
25	- gzip -9f $(DESTDIR)/man/man1/mls.1	25	- gzip -9f $(DESTDIR)/man/man1/mls.1
26	+ $(BSD_INSTALL_PROGRAM) mls $(DESTDIR)$(PREFIX)/bin	26	+ $(BSD_INSTALL_PROGRAM) mls $(DESTDIR)$(PREFIX)/bin
27	+ $(BSD_INSTALL_MAN) mls.1 $(DESTDIR)$(PREFIX)/man/man1	27	+ $(BSD_INSTALL_MAN) mls.1 $(DESTDIR)$(PREFIX)/man/man1
28	+ gzip -9f $(DESTDIR)$(PREFIX)/man/man1/mls.1
29	@echo "**************************************************************"	28	@echo "**************************************************************"
30	@echo "* To use HTML feature or PHP wrapper, copy contents of *"	29	@echo "* To use HTML feature or PHP wrapper, copy contents of *"
31	@echo "* 'html' subdirectory to location accessible by your *"	30	@echo "* 'html' subdirectory to location accessible by your *"




--- mls.c.orig	2003-05-27 21:47:26 UTC
+++ mls.c
@@ -51,6 +51,16 @@ time_t t;          // actual time - to be added to out
 time_t t_oldest,
        t_newest;   // date of oldest/newest message found
 
+// Reg. expressions
+regex_t r_from, r_time, r_re, r_date, r_dow, r_mail,
+        r_m_ims, r_m_bat, r_m_lot, r_m_oue, r_m_ouc, r_m_oum, r_m_out,
+        r_m_cal, r_m_moz, r_m_peg, r_m_eud, r_m_ope, r_m_opw, r_m_pos,
+        r_m_pob, r_m_kma, r_m_imp, r_m_mut, r_m_pin, r_m_pi2, r_m_syl,
+        r_m_pan, r_m_4td, r_m_fag, r_m_mpg, r_m_xws, r_m_knd, r_m_hst,
+        r_m_nnr;
+
+regex_t r_qp, r_base64, r_hex;
+
 /* ************************************************* Other * FUNCTIONS *** */
 /* ***** banner ********************************************************** */
 void banner() { // print greeting banner




--- mls.h.orig	2003-06-02 11:26:34 UTC
+++ mls.h
@@ -75,6 +75,9 @@
 #define EXIT_NOMEM  4
 #define EXIT_REGEX  5

 /* *** structures for BEST messages *** */
 typedef struct bestQUOTE* nQptr;
 struct bestQUOTE {
@@ -104,7 +107,7 @@ struct bestTEXT {
 };
 
 // Reg. expressions
-regex_t r_from, r_time, r_re, r_date, r_dow, r_mail,
+extern regex_t r_from, r_time, r_re, r_date, r_dow, r_mail,
         r_m_ims, r_m_bat, r_m_lot, r_m_oue, r_m_ouc, r_m_oum, r_m_out,
 	r_m_cal, r_m_moz, r_m_peg, r_m_eud, r_m_ope, r_m_opw, r_m_pos,
 	r_m_pob, r_m_kma, r_m_imp, r_m_mut, r_m_pin, r_m_pi2, r_m_syl,

Added Link Here

(-)b/mail/mls/files/patch-mls__mime.h (+11 lines)
1	--- mls_mime.h.orig 2021-11-01 09:11:54 UTC
2	+++ mls_mime.h
3	@@ -21,7 +21,7 @@
4	#ifndef _MLS_MIME_H
5	#define _MLS_MIME_H 1
6
7	-regex_t r_qp, r_base64, r_hex;
8	+extern regex_t r_qp, r_base64, r_hex;
9
10	/* ******************************************* FUNCTION DECLARATIONS * */
11	int base64_table(char *lookup);

Lines 1-5 Link Here

(-)b/mail/mls/files/patch-mls_text.c (-2 / +2 lines)
1	--- mls_text.c.orig 2007-08-26 03:28:10.000000000 +0800	1	--- mls_text.c.orig 2003-05-27 20:07:13 UTC
2	+++ mls_text.c 2007-08-26 03:28:32.000000000 +0800	2	+++ mls_text.c
3	@@ -22,9 +22,6 @@	3	@@ -22,9 +22,6 @@
4	#include "mls_lang.h"	4	#include "mls_lang.h"
5	#include "mls_stat.h"	5	#include "mls_stat.h"

Lines 1-6 Link Here

(-)b/mail/mls/files/patch-mls_text.h (-3 / +3 lines)
1	--- mls_text.h.orig 2007-08-26 03:29:23.000000000 +0800	1	--- mls_text.h.orig 2003-02-15 10:16:07 UTC
2	+++ mls_text.h 2007-08-26 03:30:12.000000000 +0800	2	+++ mls_text.h
3	@@ -30,7 +30,7 @@	3	@@ -30,7 +30,7 @@ void PrintTop(nTptr, int);
4	void PrintTopQ(nTptr, int);	4	void PrintTopQ(nTptr, int);
5	void PrintTopHtml(nTptr, int);	5	void PrintTopHtml(nTptr, int);
6	void PrintGraph(long[], int, int);	6	void PrintGraph(long[], int, int);

Added Link Here

(-)b/mail/mls/files/pkg-message.in (-1 / +6 lines)
0	-	1	To use the HTML feature or the PHP wrapper, copy the
		2	contents of %%DATADIR%%/html to a location
		3	accessible by your webserver. For more information,
		4	see %%DOCSDIR%%/README.txt!
		5
		6	See also %%EXAMPLESDIR%% for some hints...

Return to bug 259586

Lines 2-22 Link Here

(-)b/mail/mls/Makefile (-5 / +28 lines)
2		2
3	PORTNAME= mls	3	PORTNAME= mls
4	PORTVERSION= 1.3	4	PORTVERSION= 1.3
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= mail	6	CATEGORIES= mail
7	MASTER_SITES= http://www.marki-online.net/MLS/ \	7	MASTER_SITES= http://www.marki-online.net/MLS/ \
8	http://marki.host.sk/MLS/	8	http://marki.host.sk/MLS/
9	EXTRACT_SUFX= .tgz
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= fuz@fuz.su
12	COMMENT= Program for generating various statistics on emails	11	COMMENT= Program for generating various statistics on emails
13		12
14	BROKEN_FreeBSD_13= ld: error: duplicate symbol: r_base64	13	LICENSE= GPLv2
15	BROKEN_FreeBSD_14= ld: error: duplicate symbol: r_base64	14	LICENSE_FILE= ${WRKSRC}/COPYING.gz
16		15
		16	USES= tar:tgz
		17
		18	SUB_FILES= pkg-message
17	PLIST_FILES= bin/mls man/man1/mls.1.gz	19	PLIST_FILES= bin/mls man/man1/mls.1.gz
		20	PORTDATA= html/bar.gif html/mls_class.php html/style_mls.css
		21	PORTEXAMPLES= README example.php forward procmailrc
		22	PORTDOCS= README.txt
18		23
19	MAKE_ARGS+= CC="${CC}" CFLAGS="${CFLAGS}"	24	MAKE_ARGS+= CC="${CC}" CFLAGS="${CFLAGS}"
20	ALL_TARGET= mls	25	ALL_TARGET= mls
21		26
		27	OPTIONS_DEFINE= DOCS EXAMPLES
		28
		29	post-install:
		30	${MKDIR} ${STAGEDIR}${DATADIR}/html
		31	.for f in ${PORTDATA}
		32	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}/html/
		33	.endfor
		34
		35	post-install-DOCS-on:
		36	${MKDIR} ${STAGEDIR}${DOCSDIR}
		37	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
		38
		39	post-install-EXAMPLES-on:
		40	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		41	.for f in ${PORTEXAMPLES}
		42	${INSTALL_DATA} ${WRKSRC}/examples/$f ${STAGEDIR}${EXAMPLESDIR}
		43	.endfor
		44
22	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Added Link Here

(-)b/mail/mls/files/patch-mls.c (+19 lines)
1	--- mls.c.orig 2003-05-27 21:47:26 UTC
2	+++ mls.c
3	@@ -51,6 +51,16 @@ time_t t; // actual time - to be added to out
4	time_t t_oldest,
5	t_newest; // date of oldest/newest message found
6
7	+// Reg. expressions
8	+regex_t r_from, r_time, r_re, r_date, r_dow, r_mail,
9	+ r_m_ims, r_m_bat, r_m_lot, r_m_oue, r_m_ouc, r_m_oum, r_m_out,
10	+ r_m_cal, r_m_moz, r_m_peg, r_m_eud, r_m_ope, r_m_opw, r_m_pos,
11	+ r_m_pob, r_m_kma, r_m_imp, r_m_mut, r_m_pin, r_m_pi2, r_m_syl,
12	+ r_m_pan, r_m_4td, r_m_fag, r_m_mpg, r_m_xws, r_m_knd, r_m_hst,
13	+ r_m_nnr;
14	+
15	+regex_t r_qp, r_base64, r_hex;
16	+
17	/* ************************************************* Other * FUNCTIONS *** */
18	/* *** banner ******************************************************** */
19	void banner() { // print greeting banner

Lines 1-5 Link Here

(-)b/mail/mls/files/patch-mls.h (-2 / +11 lines)
1	--- mls.h.orig 2007-08-26 03:26:30.000000000 +0800	1	--- mls.h.orig 2003-06-02 11:26:34 UTC
2	+++ mls.h 2007-08-26 03:27:11.000000000 +0800	2	+++ mls.h
3	@@ -75,6 +75,9 @@	3	@@ -75,6 +75,9 @@
4	#define EXIT_NOMEM 4	4	#define EXIT_NOMEM 4
5	#define EXIT_REGEX 5	5	#define EXIT_REGEX 5
Lines 10-12 Link Here
10	/* * structures for BEST messages * */	10	/* * structures for BEST messages * */
11	typedef struct bestQUOTE* nQptr;	11	typedef struct bestQUOTE* nQptr;
12	struct bestQUOTE {	12	struct bestQUOTE {
		13	@@ -104,7 +107,7 @@ struct bestTEXT {
		14	};
		15
		16	// Reg. expressions
		17	-regex_t r_from, r_time, r_re, r_date, r_dow, r_mail,
		18	+extern regex_t r_from, r_time, r_re, r_date, r_dow, r_mail,
		19	r_m_ims, r_m_bat, r_m_lot, r_m_oue, r_m_ouc, r_m_oum, r_m_out,
		20	r_m_cal, r_m_moz, r_m_peg, r_m_eud, r_m_ope, r_m_opw, r_m_pos,
		21	r_m_pob, r_m_kma, r_m_imp, r_m_mut, r_m_pin, r_m_pi2, r_m_syl,