Update to 0.96.

4 files changed, 39 insertions, 39 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 4a13bb38c71a..59088b18e879 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	0.95
+PORTVERSION=	0.96
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
@@ -23,4 +23,6 @@ CONFIGURE_ARGS=	--disable-doxygen
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 .include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 5357176224a3..025776a8199b 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1 +1 @@
-MD5 (libxklavier-0.95.tar.gz) = 5caeb8aea1caac0c3fb0f9115f846a14
+MD5 (libxklavier-0.96.tar.gz) = e95baf323e145403a1cd4f9405da60da
diff --git a/x11/libxklavier/files/patch-libxlavier_xklavier_config.c b/x11/libxklavier/files/patch-libxlavier_xklavier_config.c
deleted file mode 100644
index 61a7f2f85379..000000000000
--- a/x11/libxklavier/files/patch-libxlavier_xklavier_config.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- libxklavier/xklavier_config.c.orig	Thu May 15 00:43:07 2003
-+++ libxklavier/xklavier_config.c	Thu May 15 00:45:12 2003
-@@ -42,6 +42,18 @@
- static XkbComponentNamesRec componentNames;
- static char *locale;
- 
-+static char *
-+xxx_strndup(const char *str, int len) {
-+    char *ret;
-+
-+    if ((str == NULL || len < 0)) return(NULL);
-+    ret = (char *)malloc(len + 1);
-+    if (ret == NULL) return(NULL);
-+    memcpy(ret, str, len);
-+    ret[len] = '\0';
-+    return(ret);
-+}
-+
- static Bool _XklConfigInitialized(  )
- {
-   return theRegistry.xpathContext != NULL;
-@@ -306,13 +318,13 @@
-     while( ( npc = strchr( pc, ',' ) ) != NULL )
-     {
-       int len = npc - pc;
--      *ppc = ( char * ) strndup( pc, len );
-+      *ppc = ( char * ) xxx_strndup( pc, len );
-       ppc++;
-       pc = npc + 1;
-     }
- 
-     len = npc - pc;
--    *ppc = ( char * ) strndup( pc, len );
-+    *ppc = ( char * ) xxx_strndup( pc, len );
-   }
- }
- 
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index 2f0f7c95220c..f80dbc6dea38 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -4,6 +4,41 @@ lib/libxklavier.a
 lib/libxklavier.so
 lib/libxklavier.so.7
 libdata/pkgconfig/libxklavier.pc
+share/doc/libxklavier-%%VERSION%%/html/annotated.html
+share/doc/libxklavier-%%VERSION%%/html/doxygen.css
+share/doc/libxklavier-%%VERSION%%/html/doxygen.png
+share/doc/libxklavier-%%VERSION%%/html/files.html
+share/doc/libxklavier-%%VERSION%%/html/functions.html
+share/doc/libxklavier-%%VERSION%%/html/globals.html
+share/doc/libxklavier-%%VERSION%%/html/group__activation.html
+share/doc/libxklavier-%%VERSION%%/html/group__callbacks.html
+share/doc/libxklavier-%%VERSION%%/html/group__currents.html
+share/doc/libxklavier-%%VERSION%%/html/group__debugerr.html
+share/doc/libxklavier-%%VERSION%%/html/group__enum.html
+share/doc/libxklavier-%%VERSION%%/html/group__lookup.html
+share/doc/libxklavier-%%VERSION%%/html/group__props.html
+share/doc/libxklavier-%%VERSION%%/html/group__settings.html
+share/doc/libxklavier-%%VERSION%%/html/group__wininfo.html
+share/doc/libxklavier-%%VERSION%%/html/group__xkbevents.html
+share/doc/libxklavier-%%VERSION%%/html/group__xkbgroup.html
+share/doc/libxklavier-%%VERSION%%/html/group__xkbinfo.html
+share/doc/libxklavier-%%VERSION%%/html/group__xklconfig.html
+share/doc/libxklavier-%%VERSION%%/html/group__xklconfiginitterm.html
+share/doc/libxklavier-%%VERSION%%/html/group__xklinitterm.html
+share/doc/libxklavier-%%VERSION%%/html/index.html
+share/doc/libxklavier-%%VERSION%%/html/modules.html
+share/doc/libxklavier-%%VERSION%%/html/structXklState-members.html
+share/doc/libxklavier-%%VERSION%%/html/structXklState.html
+share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigItem-members.html
+share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigItem.html
+share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigRec-members.html
+share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigRec.html
+share/doc/libxklavier-%%VERSION%%/html/xklavier_8h-source.html
+share/doc/libxklavier-%%VERSION%%/html/xklavier_8h.html
+share/doc/libxklavier-%%VERSION%%/html/xklavier__config_8h-source.html
+share/doc/libxklavier-%%VERSION%%/html/xklavier__config_8h.html
 share/libxklavier/xfree86.xml
 @dirrm share/libxklavier
+@dirrm share/doc/libxklavier-%%VERSION%%/html
+@dirrm share/doc/libxklavier-%%VERSION%%
 @dirrm include/libxklavier