4 files changed, 21 insertions, 31 deletions

diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile
index b1f61b43ec6d..e29782eb2fed 100644
--- a/ftp/oftpd/Makefile
+++ b/ftp/oftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	oftpd
-PORTVERSION=	0.3.6
-PORTREVISION=	2
+PORTVERSION=	0.3.7
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.time-travellers.org/oftpd/ \
 		http://atreides.freenix.no/~anders/
@@ -15,36 +14,30 @@ MASTER_SITES=	http://www.time-travellers.org/oftpd/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A threaded, anonymous only FTP server designed for security
 
-GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-
-DOCFILES=	README AUTHORS ChangeLog NEWS TODO BUGS
-
-CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	LIBS="-pthread"
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		oftpd.8
+PORTDOCS=	README AUTHORS ChangeLog NEWS TODO BUGS
+PLIST_FILES=	sbin/oftpd
 
 post-patch:
+	${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
+		 s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 .if defined(MAX_NUM_CLIENTS)
-	${REINPLACE_CMD} -e "s@MAX_NUM_CLIENTS 300@MAX_NUM_CLIENTS ${MAX_NUM_CLIENTS}@" ${WRKSRC}/src/oftpd.h
+	${REINPLACE_CMD} -e 's|MAX_NUM_CLIENTS 300|MAX_NUM_CLIENTS ${MAX_NUM_CLIENTS}|g' ${WRKSRC}/src/oftpd.h
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/oftpd ${PREFIX}/sbin/oftpd
+	${INSTALL_PROGRAM} ${WRKSRC}/src/oftpd ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/man/oftpd.8 ${MANPREFIX}/man/man8
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -m 555 ${PREFIX}/share/doc/oftpd
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/oftpd
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/man/oftpd.8 ${MANPREFIX}/man/man8
-	@${ECHO_MSG} "================================================================================"
-	@${ECHO_MSG} "oftpd only runs standalone, not from inetd."
-	@${ECHO_MSG} "Create a README file in the root anonymous FTP dir to have it displayed to"
-	@${ECHO_MSG} "users upon login."
-	@${ECHO_MSG} "================================================================================"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/ftp/oftpd/distinfo b/ftp/oftpd/distinfo
index 998458e095cb..40d8e3115dc7 100644
--- a/ftp/oftpd/distinfo
+++ b/ftp/oftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (oftpd-0.3.6.tar.gz) = 78b4139bb0108297b9814564db986852
-SIZE (oftpd-0.3.6.tar.gz) = 77201
+MD5 (oftpd-0.3.7.tar.gz) = 1a396ad12584c7efe3a0e712dadf28be
+SIZE (oftpd-0.3.7.tar.gz) = 97364
diff --git a/ftp/oftpd/pkg-message b/ftp/oftpd/pkg-message
new file mode 100644
index 000000000000..379c8daf0c01
--- /dev/null
+++ b/ftp/oftpd/pkg-message
@@ -0,0 +1,5 @@
+================================================================================
+oftpd only runs standalone, not from inetd.
+Create a README file in the root anonymous FTP dir to have it displayed to
+users upon login.
+================================================================================
diff --git a/ftp/oftpd/pkg-plist b/ftp/oftpd/pkg-plist
deleted file mode 100644
index 776b742a53ba..000000000000
--- a/ftp/oftpd/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-sbin/oftpd
-%%PORTDOCS%%share/doc/oftpd/README
-%%PORTDOCS%%share/doc/oftpd/AUTHORS
-%%PORTDOCS%%share/doc/oftpd/ChangeLog
-%%PORTDOCS%%share/doc/oftpd/NEWS
-%%PORTDOCS%%share/doc/oftpd/TODO
-%%PORTDOCS%%share/doc/oftpd/BUGS
-%%PORTDOCS%%@dirrm share/doc/oftpd