ports/51861: Update port: misc/dvorakng

[KATO Tsuguru]

>Number:         51861
>Category:       ports
>Synopsis:       Update port: misc/dvorakng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 06 07:40:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CXX/CXXFLAGS properly
- Utilize USE_GETOPT_LONG

Remove file:
files/patch-Makefile

Following PR(s) should be superseded by this one:
[2003/04/28] ports/51528  ports-bugs  [PATCH] Convert misc/dvorakng to USE_GETOPT_LONG

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/misc/dvorakng/Makefile misc/dvorakng/Makefile
--- /usr/ports/misc/dvorakng/Makefile	Wed Mar 26 17:29:43 2003
+++ misc/dvorakng/Makefile	Tue May  6 01:43:07 2003
@@ -14,21 +14,14 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A Dvorak typing tutor
 
-USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-MAKE_ARGS=	PROF="-I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-lncurses -lgnugetopt"
-.else
-MAKE_ARGS=	PROF="${CFLAGS}"
-.endif
+USE_BZIP2=	yes
+USE_GETOPT_LONG=	yes
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dvorakng ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/misc/dvorakng/files/patch-Makefile misc/dvorakng/files/patch-Makefile
--- /usr/ports/misc/dvorakng/files/patch-Makefile	Wed Mar 26 17:29:43 2003
+++ misc/dvorakng/files/patch-Makefile	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.orig	Wed Mar 26 16:27:35 2003
-+++ Makefile	Wed Mar 26 16:27:42 2003
-@@ -11,7 +11,7 @@
- CC       = gcc
- CXX      = g++
- PROF     = #-g0 -O2
--CFLAGS   = $(PROF) -fmessage-length=0 -Wall $(LIMIT_LENGTH)
-+CFLAGS   = $(PROF) -Wall $(LIMIT_LENGTH)
- CXXFLAGS = $(CFLAGS)
- LDFLAGS  = $(PROF)
- LIBS     = -lncurses
>Release-Note:
>Audit-Trail:
>Unformatted: