Attachment #37444 for bug #59605

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




#

PORTNAME=	vpopmail
PORTVERSION=	5.3.30
PORTREVISION=	0
CATEGORIES=	mail
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

		else \
			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
		fi; \
	fi
	if [ ! -e "${PREFIX}/vpopmail/etc/vlimits.default" ]; then \
		${TOUCH} ${PREFIX}/vpopmail/etc/vlimits.default; \
	fi
.if defined(DEFAULT_DOMAIN)
	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain

Line 1 Link Here

(-)vpopmail/distinfo (-1 / +1 lines)
1	MD5 (vpopmail-5.3.29.tar.gz) = 42904ce91d4b0398ae8f964d692f88af	1	MD5 (vpopmail-5.3.30.tar.gz) = 45a87b772bb158468c1c1039f8765965

Lines 1-13 Link Here

(-)vpopmail/files/patch-Makefile.in (-6 / +27 lines)
1	--- Makefile.in.orig Thu Sep 4 23:45:08 2003	1	--- Makefile.in.orig Fri Nov 21 00:10:01 2003
2	+++ Makefile.in Thu Sep 4 23:46:17 2003	2	+++ Makefile.in Sun Nov 23 11:58:04 2003
3	@@ -705,10 +705,7 @@	3	@@ -723,29 +723,15 @@
		4	echo "-I@vpopmaildir@/include" > @vpopmaildir@/etc/inc_deps
		5	echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > @vpopmaildir@/etc/lib_deps
4		6
		7	+ $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
		8	+ vlimits.default $(VLIMITS)-dist; \
		9	if test ! -r $(VLIMITS); then \
		10	$(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
		11	vlimits.default $(VLIMITS); \
		12	fi
5	if test "@USE_MYSQL@" = "1"; then \	13	if test "@USE_MYSQL@" = "1"; then \
6	if test ! -r $(MYSQLCONF); then \	14	if test ! -r $(MYSQLCONF); then \
7	- echo "# MySQL settings, line 1 is config for read-only," > $(MYSQLCONF); \	15	- echo "# MYSQL CONNECTION SETTINGS FOR VPOPMAIL" >> $(MYSQLCONF); \
8	- echo "# line 2 is config for update. Settings for each" >> $(MYSQLCONF); \	16	- echo "#" >> $(MYSQLCONF); \
9	- echo "# line: server\|port\|user\|password\|database" >> $(MYSQLCONF); \	17	- echo "# Line 1 defines the connection to use for database reads," >> $(MYSQLCONF); \
		18	- echo "# Line 2 defines the connection to use for database updates/writes." >> $(MYSQLCONF); \
		19	- echo "#" >> $(MYSQLCONF); \
		20	- echo "# If you omit line 2, then the same settings will be" >> $(MYSQLCONF); \
		21	- echo "# used for both read and write." >> $(MYSQLCONF); \
		22	- echo "#" >> $(MYSQLCONF); \
		23	- echo "# settings for each line:" >> $(MYSQLCONF); \
		24	- echo "# host\|port\|user\|password\|database" >> $(MYSQLCONF); \
		25	- echo "#" >> $(MYSQLCONF); \
10	- echo "localhost\|0\|root\|secret\|vpopmail" >> $(MYSQLCONF); \	26	- echo "localhost\|0\|root\|secret\|vpopmail" >> $(MYSQLCONF); \
		27	- echo "#" >> $(MYSQLCONF); \
		28	- echo "# Note:" >> $(MYSQLCONF); \
		29	- echo "# The value of host may be either a hostname or an IP address." >> $(MYSQLCONF); \
		30	- echo "# If host is 'localhost', then sockets (Unix) or named pipes (Windows)" >> $(MYSQLCONF); \
		31	- echo "# will be used instead of TCP/IP to connect to the server." >> $(MYSQLCONF); \
11	+ touch $(MYSQLCONF); \	32	+ touch $(MYSQLCONF); \
12	fi ; \	33	fi ; \
13	chown @vpopuser@ $(MYSQLCONF) ; \	34	chown @vpopuser@ $(MYSQLCONF) ; \

Lines 3-8 Link Here

(-)vpopmail/pkg-plist (-1 / +4 lines)
3	vpopmail/bin/vadddomain	3	vpopmail/bin/vadddomain
4	vpopmail/bin/vadduser	4	vpopmail/bin/vadduser
5	vpopmail/bin/valias	5	vpopmail/bin/valias
		6	vpopmail/bin/vchangepw
6	vpopmail/bin/vchkpw	7	vpopmail/bin/vchkpw
7	vpopmail/bin/vconvert	8	vpopmail/bin/vconvert
8	vpopmail/bin/vdeldomain	9	vpopmail/bin/vdeldomain
Lines 40-45 Link Here
40	vpopmail/etc/inc_deps	41	vpopmail/etc/inc_deps
41	vpopmail/etc/lib_deps	42	vpopmail/etc/lib_deps
42	@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi	43	@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
		44	@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
		45	vpopmail/etc/vlimits.default-dist
43	@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi	46	@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
44	vpopmail/include/config.h	47	vpopmail/include/config.h
45	vpopmail/include/vauth.h	48	vpopmail/include/vauth.h
Lines 49-55 Link Here
49	vpopmail/lib/libvpopmail.a	52	vpopmail/lib/libvpopmail.a
50	@dirrm vpopmail/lib	53	@dirrm vpopmail/lib
51	@dirrm vpopmail/include	54	@dirrm vpopmail/include
52	@dirrm vpopmail/etc	55	@unexec rmdir %D/vpopmail/etc 2>/dev/null \|\| true
53	@unexec rmdir %D/vpopmail/domains 2>/dev/null \|\| true	56	@unexec rmdir %D/vpopmail/domains 2>/dev/null \|\| true
54	@dirrm vpopmail/doc/man_html	57	@dirrm vpopmail/doc/man_html
55	@dirrm vpopmail/doc/doc_html	58	@dirrm vpopmail/doc/doc_html

Return to bug 59605

Lines 6-13 Link Here

(-)vpopmail/Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= vpopmail	8	PORTNAME= vpopmail
9	PORTVERSION= 5.3.29	9	PORTVERSION= 5.3.30
10	PORTREVISION= 1	10	PORTREVISION= 0
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 308-316 Link Here
308	else \	308	else \
309	${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \	309	${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
310	fi; \	310	fi; \
311	fi
312	if [ ! -e "${PREFIX}/vpopmail/etc/vlimits.default" ]; then \
313	${TOUCH} ${PREFIX}/vpopmail/etc/vlimits.default; \
314	fi	311	fi
315	.if defined(DEFAULT_DOMAIN)	312	.if defined(DEFAULT_DOMAIN)
316	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain	313	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain