7 files changed, 53 insertions, 55 deletions

diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index 09e74a7e7fbf..17917fdaee59 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -5,29 +5,37 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xxkb
-PORTVERSION=	1.10
-PORTREVISION=	1
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		xxkb
+PORTVERSION=		1.11
+CATEGORIES=		x11
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xxkb
+DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	alexander.pohoyda@gmx.net
-COMMENT=	An XKB keyboard layout switcher and indicator
+MAINTAINER=		alexander.pohoyda@gmx.net
+COMMENT=		An XKB keyboard layout switcher and indicator
 
-MAN1=		xxkb.1
-USE_XPM=	yes
-USE_IMAKE=	yes
+WRKSRC=			${WRKDIR}/${PORTNAME}
+USE_XPM=		yes
+USE_IMAKE=		yes
+
+MAN1=			xxkb.1
+
+OPTIONS=		LIBRSVG	"With SVG(librsvg2) support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_LIBRSVG)
+LIB_DEPENDS+=		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+XMKMF=			xmkmf -a -DWITH_SVG_SUPPORT
+.endif
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/XXkb.ad ${PREFIX}/lib/X11/app-defaults/XXkb
-	@${MKDIR} ${PREFIX}/share/xxkb
-	${INSTALL_DATA} ${WRKSRC}/*.xpm ${PREFIX}/share/xxkb
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for FILE in LICENSE CHANGES.koi8 README.koi8
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
+.	for file in LICENSE README CHANGES.koi8 README.koi8
+	    ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.	endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/xxkb/distinfo b/x11/xxkb/distinfo
index 025845e5721d..41125d935145 100644
--- a/x11/xxkb/distinfo
+++ b/x11/xxkb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xxkb-1.10.tar.gz) = afb2dd4d9e91e5fce837d4bb6723fe4e
-SHA256 (xxkb-1.10.tar.gz) = 32b5461f1bb2e56a8cf68661e536bcb2d18bb6aac9f78120b1c0dd9e0db538ce
-SIZE (xxkb-1.10.tar.gz) = 29178
+MD5 (xxkb-1.11-src.tar.gz) = c2e5c7f3285033f0e26b358ef95a7c89
+SHA256 (xxkb-1.11-src.tar.gz) = 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c
+SIZE (xxkb-1.11-src.tar.gz) = 37262
diff --git a/x11/xxkb/files/patch-Imakefile b/x11/xxkb/files/patch-Imakefile
new file mode 100644
index 000000000000..f0bf52ddc7c7
--- /dev/null
+++ b/x11/xxkb/files/patch-Imakefile
@@ -0,0 +1,11 @@
+--- Imakefile.orig	Sun Jun 17 02:29:38 2007
++++ Imakefile	Sun Jun 17 02:30:03 2007
+@@ -3,7 +3,7 @@
+ BASEDIR = $(PROJECTROOT)
+ BINDIR = $(BASEDIR)/bin
+ PIXMAPDIR = $(BASEDIR)/share/xxkb
+-LOCAL_LIBRARIES = $(XONLYLIB) -lXpm -lXt
++LOCAL_LIBRARIES = $(XLIB) $(XTOOLLIB) $(XPMLIB)
+ 
+ OBJS = xxkb.o resource.o wlist.o
+ PIXMAPS = pixmaps/by15.xpm pixmaps/by48.xpm \
diff --git a/x11/xxkb/files/patch-aa b/x11/xxkb/files/patch-aa
deleted file mode 100644
index 62b18a97597d..000000000000
--- a/x11/xxkb/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Imakefile.orig	Wed Mar 19 07:56:21 2003
-+++ Imakefile	Sun May 18 13:57:21 2003
-@@ -13,9 +13,7 @@
- 
- DEFINES = -DAPPDEFDIR=\"$(DESTDIR)$(XAPPLOADDIR)\" \
- 	-DPIXMAPDIR=\"$(DESTDIR)$(PIXMAPDIR)\"
--CDEBUGFLAGS = -O2
-+CFLAGS ?= -Wall -O2
- 
- ComplexProgramTarget(xxkb)
- 
--InstallAppDefaults(XXkb)
--InstallMultiple	($(PIXMAPS),$(PIXMAPDIR))
diff --git a/x11/xxkb/files/patch-resource.c b/x11/xxkb/files/patch-resource.c
deleted file mode 100644
index 974ddc58d8fd..000000000000
--- a/x11/xxkb/files/patch-resource.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- resource.c.orig	Sat Nov 30 15:34:12 2002
-+++ resource.c	Sat Aug 14 11:48:57 2004
-@@ -383,7 +383,7 @@
-   case XpmNoMemory:
-     printf("No memory for open xpm file: %s\n", name);
-     break;
--  default:
-+  default: break;
-   }
- }
- 
diff --git a/x11/xxkb/pkg-descr b/x11/xxkb/pkg-descr
index 64a3dc1ae923..15dbb108871d 100644
--- a/x11/xxkb/pkg-descr
+++ b/x11/xxkb/pkg-descr
@@ -1,10 +1,9 @@
-Xxkb is a simple XKB keyboard mapping switcher. It maintains
-an active keyboard mapping on a per-window basis. An optional
-small icon is displayed in each window to indicate the selected 
-keyboard mapping. You can click this icon to switch between
-mappings in addition to being able to use the key combination 
-specified in the XKB configuration.
+Xxkb is a simple XKB keyboard mapping switcher. It maintains an active
+keyboard mapping on a per-window basis. An optional small icon is
+displayed in each window to indicate the selected keyboard mapping. You
+can click this icon to switch between mappings in addition to being able
+to use the key combination specified in the XKB configuration.
 
 Xxkb works with virtually any window manager.
 
-WWW: http://www.tsu.ru/~pascal/other/xxkb/
+WWW: http://www.sourceforge.net/projects/xxkb/
diff --git a/x11/xxkb/pkg-plist b/x11/xxkb/pkg-plist
index 8474faf17651..abd40f6133d6 100644
--- a/x11/xxkb/pkg-plist
+++ b/x11/xxkb/pkg-plist
@@ -1,9 +1,15 @@
 bin/xxkb
 lib/X11/app-defaults/XXkb
+%%DATADIR%%/bg15.xpm
+%%DATADIR%%/bg48.xpm
 %%DATADIR%%/by15.xpm
 %%DATADIR%%/by48.xpm
+%%DATADIR%%/de15.xpm
+%%DATADIR%%/de48.xpm
 %%DATADIR%%/en15.xpm
 %%DATADIR%%/en48.xpm
+%%DATADIR%%/il15.xpm
+%%DATADIR%%/il48.xpm
 %%DATADIR%%/ru15.xpm
 %%DATADIR%%/ru48.xpm
 %%DATADIR%%/su15.xpm
@@ -11,7 +17,8 @@ lib/X11/app-defaults/XXkb
 %%DATADIR%%/ua15.xpm
 %%DATADIR%%/ua48.xpm
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.koi8
 %%PORTDOCS%%%%DOCSDIR%%/README.koi8
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/xxkb
+@dirrm %%DATADIR%%