5 files changed, 4 insertions, 50 deletions

diff --git a/mail/popd/Makefile b/mail/popd/Makefile
index 0960c6939c07..e80f05f77c4b 100644
--- a/mail/popd/Makefile
+++ b/mail/popd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	popd
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp3.za.freebsd.org/pub/popd/
 
@@ -24,6 +23,6 @@ PLIST_SUB=	NOPROFILE=""
 .endif
 
 post-extract:
-	${MV} ${WRKSRC}/src/popd.8 ${WRKSRC}/src/popd.mdoc
+	${RM} ${WRKSRC}/src/.depend
 
 .include <bsd.port.mk>
diff --git a/mail/popd/distinfo b/mail/popd/distinfo
index f3bc34d37faa..39cd4ac50b30 100644
--- a/mail/popd/distinfo
+++ b/mail/popd/distinfo
@@ -1 +1 @@
-MD5 (popd-2.0.1.tar.gz) = 3f73db5a8f3b3c27042af13424b8115b
+MD5 (popd-2.2.0.tar.gz) = c55b256f35b59f940ed0a0c2a8689784
diff --git a/mail/popd/files/patch-lib::Makefile b/mail/popd/files/patch-lib::Makefile
deleted file mode 100644
index 4251acbd15ad..000000000000
--- a/mail/popd/files/patch-lib::Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/Makefile.orig	Fri Dec  7 15:34:54 2001
-+++ lib/Makefile	Fri Jan 18 15:48:02 2002
-@@ -3,11 +3,12 @@
- LIB=poputil
- SRCS=  funcs.c lockfile.c mailbox.c mbox_maildir.c mbox_mailidx.c mbox_mbf.c
- INCS=poputil.h
--CFLAGS   = -g -Wall -O -pipe -fPIC -shared -DUSE_SSL
-+CFLAGS+=	-Wall -DUSE_SSL
- SHLIB_MAJOR=    1
- SHLIB_MINOR=    0
--DESTDIR=/usr/local/
-+DESTDIR=	${PREFIX}/
-+PREFIX?=	/usr/local
- LIBDIR=lib
--INCDIR=include
-+INCLUDEDIR=	include
- 
- .include <bsd.lib.mk>
diff --git a/mail/popd/files/patch-src::Makefile b/mail/popd/files/patch-src::Makefile
deleted file mode 100644
index 0637324b9b82..000000000000
--- a/mail/popd/files/patch-src::Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/Makefile.orig	Thu Dec 27 12:13:00 2001
-+++ src/Makefile	Fri Jan 18 16:14:29 2002
-@@ -3,14 +3,19 @@
- #
- 
- PROG=	popd
--CFLAGS+=	-Wall -Werror -pedantic -I../lib -L../lib -L/usr/local/lib \
-+CFLAGS+=	-Wall -pedantic -I../lib -L../lib \
-     -DUSE_SSL -DUSE_IPV6
- LDADD=	-lcrypt -lmd -lradius -lpoputil -lssl -lcrypto
--DPSDD=	${LIBCRYPT} ${LIBMD}
-+DPADD=	${LIBCRYPT} ${LIBMD} ${LIBRADIUS}  ${LIBSSL} ${LIBCRYPTO} \
-+    ../lib/libpoputil.a
- SRCS=	popd.c authenticate.c transaction.c signals.c proxy.c
- MAN8=	popd.8
--DESTDIR=/usr/local/
--BINDIR=bin
--MANDIR=share/man
-+DESTDIR=	${PREFIX}/
-+PREFIX?=	/usr/local
-+BINDIR=libexec
-+MANDIR=man/man
-+
-+popd.8:	popd.mdoc
-+	sed -e "s,XX_PREFIX_XX,${PREFIX},g" < popd.mdoc > popd.8
- 
- .include <bsd.prog.mk>
diff --git a/mail/popd/pkg-plist b/mail/popd/pkg-plist
index 6a959356ad5b..b3416bdbff17 100644
--- a/mail/popd/pkg-plist
+++ b/mail/popd/pkg-plist
@@ -1,6 +1,6 @@
 include/poputil.h
-libexec/popd
 lib/libpoputil.a
 lib/libpoputil.so
 lib/libpoputil.so.1
 %%NOPROFILE%%lib/libpoputil_p.a
+libexec/popd