From steve@stevenwills.com  Tue Feb 12 07:33:01 2002
Return-Path: <steve@stevenwills.com>
Received: from stevenwills.com (rdu26-41-222.nc.rr.com [66.26.41.222])
	by hub.freebsd.org (Postfix) with ESMTP id EB64537B41B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Feb 2002 07:32:56 -0800 (PST)
Received: (from steve@localhost)
	by stevenwills.com (8.11.6/8.11.6) id g1CFSvO45760;
	Tue, 12 Feb 2002 10:28:57 -0500 (EST)
	(envelope-from steve)
Message-Id: <200202121528.g1CFSvO45760@stevenwills.com>
Date: Tue, 12 Feb 2002 10:28:57 -0500 (EST)
From: Steve Wills <steve@stevenwills.com>
Reply-To: User & <steve@stevenwills.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update xvkbd port to newer version
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         34877
>Category:       ports
>Synopsis:       update xvkbd port to newer version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    roam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 12 07:40:01 PST 2002
>Closed-Date:    Fri Feb 22 06:42:23 PST 2002
>Last-Modified:  Fri Feb 22 06:43:07 PST 2002
>Originator:     Steve Wills <steve@stevenwills.com>
>Release:        FreeBSD 4.4-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD tigger.example.com 4.4-RELEASE-p4 FreeBSD 4.4-RELEASE-p4 #0: Thu Jan 24 20:14:03 EST 2002 steve@tigger.example.com:/usr/obj/usr/src/sys/TIGGER i386


>Description:
	The xvkbd port currently has unfetchable files (see 
http://people.freebsd.org/~fenner/portsurvey/x11.html#xvkbd ), is out of date,
and discards the man page instead of installing it. This update fixes these
problems.
>How-To-Repeat:
	try to install the xvkbd port
>Fix:

Replace the existing Makefile, distinfo and files/patch-aa with the included
ones.

Makefile:
-------------------------------------------------------------------------
# New ports collection makefile for:	xvkbd
# Date created:		26 November 2000
# Whom:			roam@FreeBSD.org
#
# $FreeBSD: ports/x11/xvkbd/Makefile,v 1.4 2001/02/23 15:52:37 roam Exp $
#

PORTNAME=	xvkbd
PORTVERSION=	2.1
CATEGORIES=	x11
MASTER_SITES=	http://member.nifty.ne.jp/tsato/xvkbd/
MAN1=		xvkbd.1

MAINTAINER=	roam@FreeBSD.org

.if	defined(WITH_ALL)
WITH_XAW3D=	yes
WITH_XTEST=	yes
WITH_I18N=	yes
.endif

.if	defined(WITH_XAW3D)
BUILD_DEPENDS=	${X11BASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d
.endif

USE_IMAKE=	yes

pre-fetch:
		@${ECHO} "The following define controls are available:"
		@${ECHO} "- WITH_XAW3D	- Xaw3d support;"
		@${ECHO} "- WITH_XTEST	- XTEST extesions support;"
		@${ECHO} "- WITH_I18N	- internationalization;"
		@${ECHO} "- WITH_ALL	- all of the above."

.if	defined(WITH_XAW3D)
XK_DEFSUBST +=	-e 's/XCOMM define XAW3D/\#define XAW3D/;'
.endif
.if	defined(WITH_XTEST)
XK_DEFSUBST +=	-e 's/XCOMM define XTEST/\#define XTEST/;'
.endif
.if	defined(WITH_I18N)
XK_DEFSUBST +=	-e 's/XCOMM define I18N/\#define I18N/;'
.endif

.if	defined(XK_DEFSUBST)
post-patch:
		${PERL} -pi.fbsd ${XK_DEFSUBST} ${WRKSRC}/Imakefile
.endif

.include <bsd.port.mk>
-------------------------------------------------------------------------


distinfo:

-------------------------------------------------------------------------
MD5 (xvkbd-2.1.tar.gz) = c1fdc6cc40a24a4a6f77aa5f2265cc58
-------------------------------------------------------------------------

files/patch-aa
-------------------------------------------------------------------------
--- Imakefile.orig	Tue Feb 12 09:53:29 2002
+++ Imakefile	Tue Feb 12 09:54:02 2002
@@ -4,13 +4,13 @@
 
 
 XCOMM Remove the next line if you want genuine Xaw instead of Xaw3d
-#define XAW3D
+XCOMM define XAW3D
 
 XCOMM Remove the next line if you don't want to enable XTEST support
-#define XTEST
+XCOMM define XTEST
 
 XCOMM Remove the next line if you want to disable internationalization
-#define I18N
+XCOMM define I18N
 
 
 SRCS = xvkbd.c findwidget.c
-------------------------------------------------------------------------
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->roam 
Responsible-Changed-By: petef 
Responsible-Changed-When: Tue Feb 12 08:52:32 PST 2002 
Responsible-Changed-Why:  
Over to maintainer 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34877 
State-Changed-From-To: open->closed 
State-Changed-By: roam 
State-Changed-When: Fri Feb 22 06:42:23 PST 2002 
State-Changed-Why:  
Port updated, with the two new layouts added to the packing list. 
Thanks for the update; however, could you please submit a diff 
next time? :) 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34877 
>Unformatted:
