6 files changed, 10 insertions, 130 deletions

diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile
index 1ab497fb7534..04becda67a3c 100644
--- a/www/lynx-ssl/Makefile
+++ b/www/lynx-ssl/Makefile
@@ -5,36 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lynx-ssl
-PORTVERSION=	2.8.3.1
-CATEGORIES=	www
-MASTER_SITES=	ftp://lynx.isc.org/current/
-DISTNAME=	lynx2.8.3rel.1
+PKGNAMESUFFIX =	-ssl
 
-USE_OPENSSL=	yes
-USE_BZIP2=	yes
+MASTERDIR=	${.CURDIR}/../lynx
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
 
-.include <bsd.port.pre.mk>
+.include "${MASTERDIR}/Makefile"
 
-PATCH_SITES=	http://www.moxienet.com/lynx/
-PATCHFILES=	lynx-283-ssl.patch.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	sec@42.org
-
-GNU_CONFIGURE=	yes
-CFLAGS+=	-I${OPENSSLINC}/openssl
-CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc" \
-		--enable-nsl-fork
-MAKEFILE=	makefile
-INSTALL_TARGET=	install-full
-MAN1=		lynx.1
-
-WRKSRC=		${WRKDIR}/lynx2-8-3
-
-post-install:
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx_help
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/lynx
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/etc/lynx.cfg
-
-.include <bsd.port.post.mk>
+CONFIGURE_ARGS+= --with-ssl
diff --git a/www/lynx-ssl/distinfo b/www/lynx-ssl/distinfo
deleted file mode 100644
index 37ce01b3ffd4..000000000000
--- a/www/lynx-ssl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (lynx2.8.3rel.1.tar.bz2) = 162c7479203d97758d3cb07f385062ac
-MD5 (lynx-283-ssl.patch.gz) = c48607b33f493284ba60c8a431a13b03
diff --git a/www/lynx-ssl/files/patch-aa b/www/lynx-ssl/files/patch-aa
deleted file mode 100644
index 36e2b17d93f7..000000000000
--- a/www/lynx-ssl/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
---- makefile.in.orig	Thu Aug  3 18:35:17 2000
-+++ makefile.in	Fri Aug  4 03:45:59 2000
-@@ -48,15 +48,15 @@
- MANDIR= $(DESTDIR)$(mandir)
- 
- ## Where you want the lynx.cfg file installed
--libdir= @libdir@
-+libdir= @libdir@
- LIBDIR= $(DESTDIR)$(libdir)
- 
- ## Where you want the doc-files installed
--docdir= @libdir@/lynx_doc
-+docdir= @libdir@/../share/doc/lynx
- DOCDIR= $(DESTDIR)$(docdir)
- 
- ## Where you want the help-files installed
--helpdir= @libdir@/lynx_help
-+helpdir= @libdir@/../share/lynx_help
- HELPDIR= $(DESTDIR)$(helpdir)
- 
- ##set the relative location of the WWW library Implementation directory,
-@@ -84,8 +84,8 @@
- # about the SSL patch for Lynx, please see http://www.moxienet.com/lynx/.  
- # This page also contains links which enable you to test your copy of Lynx'
- # ability to make SSL connections.
--SSL_DIR= /usr/local/ssl
--SSL_LIBS= -L$(SSL_DIR)/lib -lssl -lcrypto
-+SSL_DIR= $(OPENSSLBASE)
-+SSL_LIBS= -L$(SSL_DIR)/lib -lssl -lcrypto ${EXTRA_SSL_LIBS}
- SSL_DEFINES= -DUSE_SSL -I$(SSL_DIR)/include/openssl -I$(SSL_DIR)/include
- 
- # !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/www/lynx-ssl/pkg-comment b/www/lynx-ssl/pkg-comment
index 1a866490c8c7..264a8ff933d0 100644
--- a/www/lynx-ssl/pkg-comment
+++ b/www/lynx-ssl/pkg-comment
@@ -1 +1 @@
-A non-graphical, text-based ssl-enabled World-Wide Web client
+A non-graphical, text-based https-enabled World-Wide Web client
diff --git a/www/lynx-ssl/pkg-descr b/www/lynx-ssl/pkg-descr
index 95cb84e3183e..6b8a6ddb051f 100644
--- a/www/lynx-ssl/pkg-descr
+++ b/www/lynx-ssl/pkg-descr
@@ -1,8 +1,7 @@
-lynx is a program that allows a user to access World-Wide Web servers
+lynx is a program which allows a user to access World-Wide Web servers
 and other information servers.  It uses only ascii representation so
 that it can be used from ascii-terminals and dial-in lines.
 
-WWW: http://lynx.browser.org/
+WWW: http://lynx.isc.org/
 
-This version contains the ssl patch from Mark Mentovai <mark@moxienet.com>
-available at http://www.moxienet.com/lynx/
+This version compiles with ssl enabled to access pages via https.
diff --git a/www/lynx-ssl/pkg-plist b/www/lynx-ssl/pkg-plist
deleted file mode 100644
index 8d7469c41572..000000000000
--- a/www/lynx-ssl/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/lynx
-etc/lynx.cfg
-share/lynx_help/COPYHEADER
-share/lynx_help/COPYING
-share/lynx_help/Lynx_users_guide.html
-share/lynx_help/about_lynx.html
-share/lynx_help/keystrokes/alt_edit_help.html
-share/lynx_help/keystrokes/bashlike_edit_help.html
-share/lynx_help/keystrokes/bookmark_help.html
-share/lynx_help/keystrokes/cookie_help.html
-share/lynx_help/keystrokes/dired_help.html
-share/lynx_help/keystrokes/edit_help.html
-share/lynx_help/keystrokes/environments.html
-share/lynx_help/keystrokes/follow_help.html
-share/lynx_help/keystrokes/gopher_types_help.html
-share/lynx_help/keystrokes/history_help.html
-share/lynx_help/keystrokes/keystroke_help.html
-share/lynx_help/keystrokes/movement_help.html
-share/lynx_help/keystrokes/option_help.html
-share/lynx_help/keystrokes/other_help.html
-share/lynx_help/keystrokes/print_help.html
-share/lynx_help/keystrokes/scrolling_help.html
-share/lynx_help/keystrokes/test_display.html
-share/lynx_help/keystrokes/visited_help.html
-share/lynx_help/keystrokes/xterm_help.html
-share/lynx_help/lynx-dev.html
-share/lynx_help/lynx_help_main.html
-share/lynx_help/lynx_url_support.html
-share/doc/lynx/CHANGES
-share/doc/lynx/COPYHEADER
-share/doc/lynx/COPYING
-share/doc/lynx/PROBLEMS
-share/doc/lynx/README
-share/doc/lynx/samples/blue-background.lss
-share/doc/lynx/samples/cernrules.txt
-share/doc/lynx/samples/installdirs.html
-share/doc/lynx/samples/jumpsUnix.html
-share/doc/lynx/samples/jumpsVMS.html
-share/doc/lynx/samples/lynx-keymaps
-share/doc/lynx/samples/lynx.com
-share/doc/lynx/samples/lynx.lss
-share/doc/lynx/samples/mailcap
-share/doc/lynx/samples/mild-colors.lss
-share/doc/lynx/samples/mime.types
-share/doc/lynx/test/ALT88592.html
-share/doc/lynx/test/ISO_LATIN1_test.html
-share/doc/lynx/test/README.txt
-share/doc/lynx/test/TestComment.html
-share/doc/lynx/test/c1.html
-share/doc/lynx/test/iso8859-1.html
-share/doc/lynx/test/iso88592.html
-share/doc/lynx/test/raw8bit.html
-share/doc/lynx/test/sgml.html
-share/doc/lynx/test/spaces.html
-share/doc/lynx/test/tabtest.html
-share/doc/lynx/test/unicode.html
-@dirrm share/lynx_help/keystrokes
-@dirrm share/lynx_help
-@dirrm share/doc/lynx/samples
-@dirrm share/doc/lynx/test
-@dirrm share/doc/lynx