Index: Makefile
===================================================================
--- Makefile	(revision 545248)
+++ Makefile	(working copy)
@@ -1,22 +1,27 @@
-# $FreeBSD$
+# $Id$
 
 PORTNAME=	surfraw
-PORTVERSION=	2.2.9
+PORTVERSION=	2.3.0
 PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
-MAINTAINER=	jadawin@FreeBSD.org
+MAINTAINER=	accornehl@fastmail.fm
 COMMENT=	Command line interface to popular WWW search engines
 
-GNU_CONFIGURE=	yes
-USES=		gmake perl5 shebangfix
+LICENSE=	PD
+
+USES=		gmake perl5 shebangfix autoreconf
 SHEBANG_FILES=	opensearch-discover \
 		opensearch-genquery \
 		surfraw-update-path.IN
+USE_GITLAB=	YES
+GL_ACCOUNT=	surfraw
+GL_PROJECT=	Surfraw
+GL_COMMIT=	8b7e1d1f4f63d07370953ffc3abe492f943c90a2
+GNU_CONFIGURE=	yes
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.am
 	${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' \
 		-e 's/^function[[:space:]]//' \
 		${WRKSRC}/examples/uzbl_load_url_from_surfraw.IN
Index: distinfo
===================================================================
--- distinfo	(revision 545248)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (surfraw-2.2.9.tar.gz) = aa97d9ac24ca4299be39fcde562b98ed556b3bf5ee9a1ae497e0ce040bbcc4bb
-SIZE (surfraw-2.2.9.tar.gz) = 200042
+TIMESTAMP = 1597783657
+SHA256 (surfraw-Surfraw-8b7e1d1f4f63d07370953ffc3abe492f943c90a2_GL0.tar.gz) = 043c26814589dae11fdc8327d0702c4b589b603e9bc1aa6da917731fa2133a27
+SIZE (surfraw-Surfraw-8b7e1d1f4f63d07370953ffc3abe492f943c90a2_GL0.tar.gz) = 140982
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 545248)
+++ pkg-descr	(working copy)
@@ -3,4 +3,4 @@
 amazon.com, research index, slashdot and many others.  Output is
 directed to a browser.
 
-WWW: http://surfraw.alioth.debian.org/
+WWW: http://surfraw.org/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 545248)
+++ pkg-plist	(working copy)
@@ -7,6 +7,7 @@
 etc/bash_completion.d/surfraw
 @sample etc/surfraw.bookmarks.sample
 @sample etc/surfraw.conf.sample
+lib/surfraw/S
 lib/surfraw/W
 lib/surfraw/acronym
 lib/surfraw/ads
@@ -23,7 +24,6 @@
 lib/surfraw/bookfinder
 lib/surfraw/bugmenot
 lib/surfraw/bugzilla
-lib/surfraw/cablesearch
 lib/surfraw/cia
 lib/surfraw/cisco
 lib/surfraw/cite
@@ -30,6 +30,7 @@
 lib/surfraw/cliki
 lib/surfraw/cnn
 lib/surfraw/comlaw
+lib/surfraw/commandlinefu
 lib/surfraw/ctan
 lib/surfraw/currency
 lib/surfraw/cve
@@ -45,9 +46,7 @@
 lib/surfraw/debvcsbrowse
 lib/surfraw/debwiki
 lib/surfraw/deja
-lib/surfraw/deli
 lib/surfraw/discogs
-lib/surfraw/dmoz
 lib/surfraw/duckduckgo
 lib/surfraw/ebay
 lib/surfraw/etym
@@ -82,12 +81,10 @@
 lib/surfraw/musicbrainz
 lib/surfraw/mysqldoc
 lib/surfraw/netbsd
+lib/surfraw/nlab
 lib/surfraw/ntrs
 lib/surfraw/openbsd
-lib/surfraw/opensearch
-lib/surfraw/openports
 lib/surfraw/oraclesearch
-lib/surfraw/pasearch
 lib/surfraw/pgdoc
 lib/surfraw/pgpkeys
 lib/surfraw/phpdoc
@@ -97,13 +94,9 @@
 lib/surfraw/pubmed
 lib/surfraw/rae
 lib/surfraw/rfc
-lib/surfraw/rhyme
-lib/surfraw/rpmsearch
-lib/surfraw/S
 lib/surfraw/scholar
-lib/surfraw/scicom
-lib/surfraw/scirus
 lib/surfraw/scpan
+lib/surfraw/searx
 lib/surfraw/slashdot
 lib/surfraw/slinuxdoc
 lib/surfraw/sourceforge
@@ -119,16 +112,14 @@
 lib/surfraw/w3rdf
 lib/surfraw/wayback
 lib/surfraw/webster
-lib/surfraw/wetandwild
 lib/surfraw/wikipedia
+lib/surfraw/wiktionary
 lib/surfraw/woffle
 lib/surfraw/wolfram
 lib/surfraw/worldwidescience
-lib/surfraw/yacy
 lib/surfraw/yahoo
 lib/surfraw/yandex
 lib/surfraw/youtube
-lib/surfraw/yubnub
 man/man1/S.1sr.gz
 man/man1/W.1.gz
 man/man1/acronym.1sr.gz
@@ -146,12 +137,12 @@
 man/man1/bookfinder.1sr.gz
 man/man1/bugmenot.1sr.gz
 man/man1/bugzilla.1sr.gz
-man/man1/cablesearch.1sr.gz
 man/man1/cia.1sr.gz
 man/man1/cite.1sr.gz
 man/man1/cliki.1sr.gz
 man/man1/cnn.1sr.gz
 man/man1/comlaw.1sr.gz
+man/man1/commandlinefu.1sr.gz
 man/man1/ctan.1sr.gz
 man/man1/currency.1sr.gz
 man/man1/cve.1sr.gz
@@ -167,9 +158,7 @@
 man/man1/debvcsbrowse.1sr.gz
 man/man1/debwiki.1sr.gz
 man/man1/deja.1sr.gz
-man/man1/deli.1sr.gz
 man/man1/discogs.1sr.gz
-man/man1/dmoz.1sr.gz
 man/man1/duckduckgo.1sr.gz
 man/man1/ebay.1sr.gz
 man/man1/elvi.1sr.gz
@@ -204,12 +193,9 @@
 man/man1/netbsd.1sr.gz
 man/man1/ntrs.1sr.gz
 man/man1/openbsd.1sr.gz
-man/man1/openports.1sr.gz
 man/man1/opensearch-discover.1.gz
 man/man1/opensearch-genquery.1.gz
-man/man1/opensearch.1sr.gz
 man/man1/oraclesearch.1sr.gz
-man/man1/pasearch.1sr.gz
 man/man1/pgdoc.1sr.gz
 man/man1/pgpkeys.1sr.gz
 man/man1/phpdoc.1sr.gz
@@ -219,12 +205,9 @@
 man/man1/pubmed.1sr.gz
 man/man1/rae.1sr.gz
 man/man1/rfc.1sr.gz
-man/man1/rhyme.1sr.gz
-man/man1/rpmsearch.1sr.gz
 man/man1/scholar.1sr.gz
-man/man1/scicom.1sr.gz
-man/man1/scirus.1sr.gz
 man/man1/scpan.1sr.gz
+man/man1/searx.1sr.gz
 man/man1/slashdot.1sr.gz
 man/man1/slinuxdoc.1sr.gz
 man/man1/sourceforge.1sr.gz
@@ -243,13 +226,11 @@
 man/man1/w3rdf.1sr.gz
 man/man1/wayback.1sr.gz
 man/man1/webster.1sr.gz
-man/man1/wetandwild.1sr.gz
 man/man1/wikipedia.1sr.gz
+man/man1/wiktionary.1sr.gz
+man/man1/woffle.1sr.gz
 man/man1/wolfram.1sr.gz
-man/man1/woffle.1sr.gz
 man/man1/worldwidescience.1sr.gz
-man/man1/yacy.1sr.gz
 man/man1/yahoo.1sr.gz
 man/man1/yandex.1sr.gz
 man/man1/youtube.1sr.gz
-man/man1/yubnub.1sr.gz