From 3803b2c364940ccdd9a7627b1bf80b811efb8ffc Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Sat, 23 Dec 2000 16:34:03 +0000
Subject: Update to 1.1.

---
 x11/xvkbd/Makefile       | 15 ++++++++++++---
 x11/xvkbd/distinfo       |  2 +-
 x11/xvkbd/files/patch-aa | 28 ++++++++++++++++++++--------
 x11/xvkbd/pkg-plist      |  2 ++
 4 files changed, 35 insertions(+), 12 deletions(-)

(limited to 'x11/xvkbd')

diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index c696926669d9..a7661efc6dc9 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xvkbd
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	x11
 MASTER_SITES=	http://member.nifty.ne.jp/tsato/xvkbd/
 
@@ -19,11 +19,20 @@ BUILD_DEPENDS=	${X11BASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d
 USE_IMAKE=	yes
 
 pre-fetch:
-		@${ECHO} "Define WITH_XAW3D for Xaw3d support."
+		@${ECHO} "The following define controls are available:"
+		@${ECHO} "- WITH_XAW3D	- Xaw3d support;"
+		@${ECHO} "- WITH_XTEST	- XTEST extesions support;"
+		@${ECHO} "- WITH_I18N	- internationalization."
 
-.if	defined(WITH_XAW3D)
 post-patch:
+.if	defined(WITH_XAW3D)
 		${PERL} -pi.fbsd -e 's/XCOMM define XAW3D/#define XAW3D/' ${WRKSRC}/Imakefile
 .endif
+.if	defined(WITH_XTEST)
+		${PERL} -pi.fbsd -e 's/XCOMM define XTEST/#define XTEST/' ${WRKSRC}/Imakefile
+.endif
+.if	defined(WITH_I18N)
+		${PERL} -pi.fbsd -e 's/XCOMM define I18N/#define I18N/' ${WRKSRC}/Imakefile
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11/xvkbd/distinfo b/x11/xvkbd/distinfo
index c117409e0643..33ee21f1558e 100644
--- a/x11/xvkbd/distinfo
+++ b/x11/xvkbd/distinfo
@@ -1 +1 @@
-MD5 (xvkbd-1.0.tar.gz) = 3c2db168146d456e736194cf83d209cc
+MD5 (xvkbd-1.1.tar.gz) = 8e3063f81f9550abd65e37b7899bf0eb
diff --git a/x11/xvkbd/files/patch-aa b/x11/xvkbd/files/patch-aa
index b2cbd24352c0..86211d46e12d 100644
--- a/x11/xvkbd/files/patch-aa
+++ b/x11/xvkbd/files/patch-aa
@@ -1,20 +1,32 @@
---- Imakefile	2000/11/03 15:43:33	1.1.1.1
-+++ Imakefile	2000/11/07 15:40:10	1.2
-@@ -3,7 +3,7 @@
- #endif
+--- Imakefile	2000/12/23 15:05:50	1.1.1.2
++++ Imakefile	2000/12/23 16:23:31	1.5
+@@ -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
- OBJS = xvkbd.o findwidget.o
-@@ -15,7 +15,7 @@
- XAWLIB = -lXaw3d
- #endif
+@@ -34,10 +34,11 @@
+ 
+ DEFINES = $(D_XAW3D) $(D_XTEST) $(D_I18N)
  
 -ComplexProgramTarget(xvkbd)
 +ComplexProgramTargetNoMan(xvkbd)
  
  InstallAppDefaults(XVkbd)
  InstallAppDefaults(XVkbd-common)
+ InstallAppDefaults(XVkbd-german)
++InstallAppDefaults(XVkbd-jisx6004)
+ InstallAppDefaults(XVkbd-latin1)
+ InstallAppDefaults(XVkbd-small)
diff --git a/x11/xvkbd/pkg-plist b/x11/xvkbd/pkg-plist
index 29c3be2ff286..1afc46283bfa 100644
--- a/x11/xvkbd/pkg-plist
+++ b/x11/xvkbd/pkg-plist
@@ -1,5 +1,7 @@
 bin/xvkbd
+lib/X11/app-defaults/XVkbd
 lib/X11/app-defaults/XVkbd-common
 lib/X11/app-defaults/XVkbd-german
+lib/X11/app-defaults/XVkbd-jisx6004
 lib/X11/app-defaults/XVkbd-latin1
 lib/X11/app-defaults/XVkbd-small
-- 
cgit v1.2.3