Attachment #147663 for bug #193916

Lines 20-27 Link Here

(-)Makefile (-32 / +15 lines)
20		20
21	WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}	21	WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
22	ALL_TARGET= vsftpd	22	ALL_TARGET= vsftpd
23	MAN5= vsftpd.conf.5
24	MAN8= vsftpd.8
25	DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \	23	DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
26	README README.security README.ssl REFS REWARD \	24	README README.security README.ssl REFS REWARD \
27	SIZE SPEED TODO TUNING	25	SIZE SPEED TODO TUNING
Lines 30-36 Link Here
30	OPTIONS_DEFAULT= RC_SCRIPT	28	OPTIONS_DEFAULT= RC_SCRIPT
31	RC_SCRIPT_DESC= install RC_SCRIPT	29	RC_SCRIPT_DESC= install RC_SCRIPT
32		30
33	NO_STAGE= yes
34	.include <bsd.port.options.mk>	31	.include <bsd.port.options.mk>
35		32
36	.if ${PORT_OPTIONS:MRC_SCRIPT}	33	.if ${PORT_OPTIONS:MRC_SCRIPT}
Lines 45-50 Link Here
45	.endif	42	.endif
46		43
47	do-configure:	44	do-configure:
		45	.if ${PORT_OPTIONS:MSSL} && !defined(WITHOUT_SSL)
		46	${REINPLACE_CMD} -e \
		47	"s\|#undef VSF_BUILD_SSL\|#define VSF_BUILD_SSL 1\|" \
		48	${WRKSRC}/builddefs.h
		49	.endif
48	${REINPLACE_CMD} -e "s\|/etc/vsftpd\|${PREFIX}/etc\|" \	50	${REINPLACE_CMD} -e "s\|/etc/vsftpd\|${PREFIX}/etc\|" \
49	${WRKSRC}/builddefs.h	51	${WRKSRC}/builddefs.h
50	${REINPLACE_CMD} \	52	${REINPLACE_CMD} \
Lines 68-106 Link Here
68	-e 's\|delay_failed_logins\|delay_failed_login\|' \	70	-e 's\|delay_failed_logins\|delay_failed_login\|' \
69	-e 's\|delay_successful_logins\|delay_successful_login\|' \	71	-e 's\|delay_successful_logins\|delay_successful_login\|' \
70	${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c	72	${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
71	.if ${PORT_OPTIONS:MSSL}
72	${REINPLACE_CMD} -e \
73	"s\|#undef VSF_BUILD_SSL\|#define VSF_BUILD_SSL 1\|" \
74	${WRKSRC}/builddefs.h
75	.endif
76		73
77	pre-install:
78	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
79
80	do-install:	74	do-install:
81	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/	75	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${STAGEDIR}${PREFIX}/libexec/
82	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist	76	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${STAGEDIR}${PREFIX}/etc/vsftpd.conf.dist
83	${INSTALL} -d ${PREFIX}/share/vsftpd/empty	77	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
84	@if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \	78	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${PREFIX}/man/man8/
85	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \	79	${MKDIR} ${STAGEDIR}/var/ftp ${STAGEDIR}${PREFIX}/share/vsftpd/empty
86	fi
87	${MKDIR} ${PREFIX}/share/vsftpd/empty
88	@for i in ${MAN8} ; do \
89	${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man8/ ; \
90	done
91	@for i in ${MAN5} ; do \
92	${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \
93	done
94	${MKDIR} /var/ftp
95	.if ${PORT_OPTIONS:MDOCS}	80	.if ${PORT_OPTIONS:MDOCS}
96	${MKDIR} ${DOCSDIR}	81	${MKDIR} ${STAGEDIR}${DOCSDIR}
97	.for i in ${DOCFILES}	82	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
98	${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR}
99	.endfor
100	.for i in EXAMPLE SECURITY	83	.for i in EXAMPLE SECURITY
101	${MKDIR} ${DOCSDIR}/${i}	84	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
102	${CP} -p -R -L ${WRKSRC}/${i}/./ ${DOCSDIR}/${i}/	85	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
103	${CHMOD} -R -L a+rX,go-w ${DOCSDIR}/${i}/	86	${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/
104	.endfor	87	.endfor
105	.endif	88	.endif
106		89

Lines 1-10 Link Here

(-)pkg-plist (-3 / +7 lines)
1	libexec/vsftpd	1	libexec/vsftpd
2	@exec mkdir -p %D/share/vsftpd/empty	2	man/man5/vsftpd.conf.5.gz
		3	man/man8/vsftpd.8.gz
		4	@exec if ! pw groupshow ftp 2>/dev/null; then pw groupadd ftp -g 14; fi
		5	@exec if ! pw usershow ftp 2>/dev/null; then pw useradd ftp -g ftp -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous FTP"; fi
3	@unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi	6	@unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi
4	etc/vsftpd.conf.dist	7	etc/vsftpd.conf.dist
5	@exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi	8	@exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
		9	@unexec rmdir /var/ftp 2>/dev/null \|\| true
6	@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi	10	@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
7	@unexec rmdir /var/ftp 2>/dev/null \|\| true	11	@exec mkdir -p %D/share/vsftpd/empty
8	@dirrm share/vsftpd/empty	12	@dirrm share/vsftpd/empty
9	@dirrm share/vsftpd	13	@dirrm share/vsftpd
10	%%PORTDOCS%%%%DOCSDIR%%/AUDIT	14	%%PORTDOCS%%%%DOCSDIR%%/AUDIT
Lines 55-58 Link Here
55	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2	59	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2
56	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE	60	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE
57	%%PORTDOCS%%@dirrm %%DOCSDIR%%/SECURITY	61	%%PORTDOCS%%@dirrm %%DOCSDIR%%/SECURITY
58	%%PORTDOCS%%@dirrm %%DOCSDIR%%	62	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 193916