svn commit: r338258 - head/ftp/vsftpd

[Dirk Meyer]

Author: dinoex
Date: Tue Dec 31 07:41:01 2013
New Revision: 338258
URL: http://svnweb.freebsd.org/changeset/ports/338258

Log:
  - remove user ftp on deinstall
  - remove deinstall/install scripts
  
  - create /var/ftp in stage
  PR:		185300

Deleted:
  head/ftp/vsftpd/pkg-deinstall
  head/ftp/vsftpd/pkg-install
Modified:
  head/ftp/vsftpd/Makefile
  head/ftp/vsftpd/pkg-plist

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Tue Dec 31 07:27:02 2013	(r338257)
+++ head/ftp/vsftpd/Makefile	Tue Dec 31 07:41:01 2013	(r338258)
@@ -56,7 +56,7 @@ VSFTPD_NO_SSP=	-e "s|-fstack-protector -
 .endif
 
 do-configure:
-.if !defined(WITHOUT_SSL) && ${PORT_OPTIONS:MVSFTPD_SSL}
+.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)
 	${REINPLACE_CMD} -e \
 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
 		-e "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
@@ -86,14 +86,12 @@ do-configure:
 	@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# listen=YES"
 	@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# background=YES"
 
-pre-install:
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${STAGEDIR}${PREFIX}/etc/vsftpd.conf.dist
 	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${MKDIR} ${STAGEDIR}/var/ftp
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} -m 644 ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/

Modified: head/ftp/vsftpd/pkg-plist
==============================================================================
--- head/ftp/vsftpd/pkg-plist	Tue Dec 31 07:27:02 2013	(r338257)
+++ head/ftp/vsftpd/pkg-plist	Tue Dec 31 07:41:01 2013	(r338258)
@@ -1,12 +1,14 @@
 libexec/vsftpd
 man/man5/vsftpd.conf.5.gz
 man/man8/vsftpd.8.gz
- at exec mkdir -p %D/share/vsftpd/empty
+ at exec if ! pw usershow ftp 2>/dev/null; then pw useradd ftp -g operator -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous Ftp"; fi
+ at unexec if pw usershow ftp | grep -q 14:5; then pw userdel ftp; fi
 @unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi
 etc/vsftpd.conf.dist
 @exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
- at exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
 @unexec rmdir /var/ftp 2>/dev/null || true
+ at exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
+ at exec mkdir -p %D/share/vsftpd/empty
 @dirrm share/vsftpd/empty
 @dirrm share/vsftpd
 %%PORTDOCS%%%%DOCSDIR%%/AUDIT