surf: Adjust PKGNAME and install program and man page as surf (not surf2)

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Mar 6 12:17:23 2019 +0100
Changeset:	f87926c1d3aada80d08984c025a6637eb2066a27

Modified Files:
	surf/Makefile
	surf/PLIST

Log Message:
surf: Adjust PKGNAME and install program and man page as surf (not surf2)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f87926c1d3aada80d08984c025a6637eb2066a27

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 surf/Makefile | 7 -------
 surf/PLIST    | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diffs:
diff --git a/surf/Makefile b/surf/Makefile
index c7f2d30443..ac3ad68837 100644
--- a/surf/Makefile
+++ b/surf/Makefile
@@ -1,8 +1,6 @@
 # $NetBSD: Makefile,v 1.6 2015/07/13 11:10:36 leot1990 Exp $
 
 DISTNAME=	surf-2.0
-PKGNAME=	${DISTNAME:S/surf/surf2/}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dl.suckless.org/surf/
 
@@ -29,11 +27,6 @@ SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-# Install binary and man page as surf2 to avoid conflicts with wip/surf
-post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/surf ${DESTDIR}${PREFIX}/bin/surf2
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surf2.1
-
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/surf/PLIST b/surf/PLIST
index 2fd3f57e96..195a04ea16 100644
--- a/surf/PLIST
+++ b/surf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/13 10:28:14 pdtafti Exp $
-bin/surf2
-man/man1/surf2.1
+@comment $NetBSD$
+bin/surf
+man/man1/surf.1