ports/113798: Update for x11/xxkb to the version 1.11
Timur I. Bakeyev
timur at FreeBSD.org
Sun Jun 17 14:00:12 UTC 2007
>Number: 113798
>Category: ports
>Synopsis: Update for x11/xxkb to the version 1.11
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 17 14:00:11 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Timur I. Bakeyev
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.2-PRERELEASE #1: Fri Oct 27 01:16:38 CEST 2006
root at timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON
>Description:
A new version of xxkb was released a while ago. It uncludes support for SVG graphics as well as other improvements.
This update bumps the version of the port as well as make it to use SVG graphics conditionally.
>How-To-Repeat:
>Fix:
--- xxkb.diff begins here ---
diff --exclude .svn -rNu xxkb.old/Makefile xxkb/Makefile
--- xxkb.old/Makefile Sat May 19 22:28:21 2007
+++ xxkb/Makefile Sun Jun 17 04:10:48 2007
@@ -5,29 +5,37 @@
# $FreeBSD: ports/x11/xxkb/Makefile,v 1.8 2007/05/19 20:28:21 flz Exp $
#
-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 at gmx.net
-COMMENT= An XKB keyboard layout switcher and indicator
+MAINTAINER= alexander.pohoyda at 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
+ ${MKDIR} ${DOCSDIR}
+. 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 --exclude .svn -rNu xxkb.old/distinfo xxkb/distinfo
--- xxkb.old/distinfo Tue Jan 24 04:16:15 2006
+++ xxkb/distinfo Sun Jun 17 02:16:52 2007
@@ -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 --exclude .svn -rNu xxkb.old/files/patch-Imakefile xxkb/files/patch-Imakefile
--- xxkb.old/files/patch-Imakefile Thu Jan 1 01:00:00 1970
+++ xxkb/files/patch-Imakefile Sun Jun 17 02:30:18 2007
@@ -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 --exclude .svn -rNu xxkb.old/files/patch-aa xxkb/files/patch-aa
--- xxkb.old/files/patch-aa Tue May 20 06:46:59 2003
+++ xxkb/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -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 --exclude .svn -rNu xxkb.old/files/patch-resource.c xxkb/files/patch-resource.c
--- xxkb.old/files/patch-resource.c Sat Aug 14 12:45:15 2004
+++ xxkb/files/patch-resource.c Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/x11/xxkb/files/patch-resource.c,v 1.3 2004/08/14 10:45:15 krion Exp $
-
---- 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 --exclude .svn -rNu xxkb.old/pkg-descr xxkb/pkg-descr
--- xxkb.old/pkg-descr Mon Apr 2 11:35:05 2001
+++ xxkb/pkg-descr Sun Jun 17 03:55:06 2007
@@ -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 --exclude .svn -rNu xxkb.old/pkg-plist xxkb/pkg-plist
--- xxkb.old/pkg-plist Tue Mar 21 16:26:08 2006
+++ xxkb/pkg-plist Sun Jun 17 03:25:42 2007
@@ -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 @@
%%DATADIR%%/ua15.xpm
%%DATADIR%%/ua48.xpm
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.koi8
%%PORTDOCS%%%%DOCSDIR%%/README.koi8
%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm share/xxkb
+ at dirrm %%DATADIR%%
--- xxkb.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list