Attachment #79185 for bug #113798

View | Details | Raw Unified | Return to bug 113798
Collapse All | Expand All




# $FreeBSD: ports/x11/xxkb/Makefile,v 1.8 2007/05/19 20:28:21 flz Exp $
#

PORTNAME=		xxkb
PORTVERSION=		1.11
CATEGORIES=		x11
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
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

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 README CHANGES.koi8 README.koi8
	    ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.	endfor
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)xxkb/distinfo (-3 / +3 lines)
1	MD5 (xxkb-1.10.tar.gz) = afb2dd4d9e91e5fce837d4bb6723fe4e	1	MD5 (xxkb-1.11-src.tar.gz) = c2e5c7f3285033f0e26b358ef95a7c89
2	SHA256 (xxkb-1.10.tar.gz) = 32b5461f1bb2e56a8cf68661e536bcb2d18bb6aac9f78120b1c0dd9e0db538ce	2	SHA256 (xxkb-1.11-src.tar.gz) = 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c
3	SIZE (xxkb-1.10.tar.gz) = 29178	3	SIZE (xxkb-1.11-src.tar.gz) = 37262

Line 0 Link Here

(-)xxkb/files/patch-Imakefile (+11 lines)
	1	--- Imakefile.orig Sun Jun 17 02:29:38 2007
	2	+++ Imakefile Sun Jun 17 02:30:03 2007
	3	@@ -3,7 +3,7 @@
	4	BASEDIR = $(PROJECTROOT)
	5	BINDIR = $(BASEDIR)/bin
	6	PIXMAPDIR = $(BASEDIR)/share/xxkb
	7	-LOCAL_LIBRARIES = $(XONLYLIB) -lXpm -lXt
	8	+LOCAL_LIBRARIES = $(XLIB) $(XTOOLLIB) $(XPMLIB)
	9
	10	OBJS = xxkb.o resource.o wlist.o
	11	PIXMAPS = pixmaps/by15.xpm pixmaps/by48.xpm \




--- 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))





$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;
   }
 }
 

Lines 1-10 Link Here

(-)xxkb/pkg-descr (-7 / +6 lines)
1	Xxkb is a simple XKB keyboard mapping switcher. It maintains	1	Xxkb is a simple XKB keyboard mapping switcher. It maintains an active
2	an active keyboard mapping on a per-window basis. An optional	2	keyboard mapping on a per-window basis. An optional small icon is
3	small icon is displayed in each window to indicate the selected	3	displayed in each window to indicate the selected keyboard mapping. You
4	keyboard mapping. You can click this icon to switch between	4	can click this icon to switch between mappings in addition to being able
5	mappings in addition to being able to use the key combination	5	to use the key combination specified in the XKB configuration.
6	specified in the XKB configuration.
7		6
8	Xxkb works with virtually any window manager.	7	Xxkb works with virtually any window manager.
9		8
10	WWW: http://www.tsu.ru/~pascal/other/xxkb/	9	WWW: http://www.sourceforge.net/projects/xxkb/

Lines 1-9 Link Here

(-)xxkb/pkg-plist (-1 / +8 lines)
1	bin/xxkb	1	bin/xxkb
2	lib/X11/app-defaults/XXkb	2	lib/X11/app-defaults/XXkb
		3	%%DATADIR%%/bg15.xpm
		4	%%DATADIR%%/bg48.xpm
3	%%DATADIR%%/by15.xpm	5	%%DATADIR%%/by15.xpm
4	%%DATADIR%%/by48.xpm	6	%%DATADIR%%/by48.xpm
		7	%%DATADIR%%/de15.xpm
		8	%%DATADIR%%/de48.xpm
5	%%DATADIR%%/en15.xpm	9	%%DATADIR%%/en15.xpm
6	%%DATADIR%%/en48.xpm	10	%%DATADIR%%/en48.xpm
		11	%%DATADIR%%/il15.xpm
		12	%%DATADIR%%/il48.xpm
7	%%DATADIR%%/ru15.xpm	13	%%DATADIR%%/ru15.xpm
8	%%DATADIR%%/ru48.xpm	14	%%DATADIR%%/ru48.xpm
9	%%DATADIR%%/su15.xpm	15	%%DATADIR%%/su15.xpm
Lines 11-17 Link Here
11	%%DATADIR%%/ua15.xpm	17	%%DATADIR%%/ua15.xpm
12	%%DATADIR%%/ua48.xpm	18	%%DATADIR%%/ua48.xpm
13	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	19	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
		20	%%PORTDOCS%%%%DOCSDIR%%/README
14	%%PORTDOCS%%%%DOCSDIR%%/CHANGES.koi8	21	%%PORTDOCS%%%%DOCSDIR%%/CHANGES.koi8
15	%%PORTDOCS%%%%DOCSDIR%%/README.koi8	22	%%PORTDOCS%%%%DOCSDIR%%/README.koi8
16	%%PORTDOCS%%@dirrm %%DOCSDIR%%	23	%%PORTDOCS%%@dirrm %%DOCSDIR%%
17	@dirrm share/xxkb	24	@dirrm %%DATADIR%%

Return to bug 113798

Lines 5-33 Link Here

(-)xxkb/Makefile (-18 / +26 lines)
5	# $FreeBSD: ports/x11/xxkb/Makefile,v 1.8 2007/05/19 20:28:21 flz Exp $	5	# $FreeBSD: ports/x11/xxkb/Makefile,v 1.8 2007/05/19 20:28:21 flz Exp $
6	#	6	#
7		7
8	PORTNAME= xxkb	8	PORTNAME= xxkb
9	PORTVERSION= 1.10	9	PORTVERSION= 1.11
10	PORTREVISION= 1	10	CATEGORIES= x11
11	CATEGORIES= x11	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= xxkb	12	MASTER_SITE_SUBDIR= xxkb
		13	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
14		14
15	MAINTAINER= alexander.pohoyda@gmx.net	15	MAINTAINER= alexander.pohoyda@gmx.net
16	COMMENT= An XKB keyboard layout switcher and indicator	16	COMMENT= An XKB keyboard layout switcher and indicator
17		17
18	MAN1= xxkb.1	18	WRKSRC= ${WRKDIR}/${PORTNAME}
19	USE_XPM= yes	19	USE_XPM= yes
20	USE_IMAKE= yes	20	USE_IMAKE= yes
		21
		22	MAN1= xxkb.1
		23
		24	OPTIONS= LIBRSVG "With SVG(librsvg2) support" off
		25
		26	.include <bsd.port.pre.mk>
		27
		28	.if defined(WITH_LIBRSVG)
		29	LIB_DEPENDS+= rsvg-2.2:${PORTSDIR}/graphics/librsvg2
		30	XMKMF= xmkmf -a -DWITH_SVG_SUPPORT
		31	.endif
21		32
22	post-install:	33	post-install:
23	${INSTALL_DATA} ${WRKSRC}/XXkb.ad ${PREFIX}/lib/X11/app-defaults/XXkb
24	@${MKDIR} ${PREFIX}/share/xxkb
25	${INSTALL_DATA} ${WRKSRC}/*.xpm ${PREFIX}/share/xxkb
26	.if !defined(NOPORTDOCS)	34	.if !defined(NOPORTDOCS)
27	${MKDIR} ${DOCSDIR}	35	${MKDIR} ${DOCSDIR}
28	.for FILE in LICENSE CHANGES.koi8 README.koi8	36	. for file in LICENSE README CHANGES.koi8 README.koi8
29	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}	37	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
30	.endfor	38	. endfor
31	.endif	39	.endif
32		40
33	.include <bsd.port.mk>	41	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)xxkb/files/patch-aa (-13 lines)
1	--- Imakefile.orig Wed Mar 19 07:56:21 2003
2	+++ Imakefile Sun May 18 13:57:21 2003
3	@@ -13,9 +13,7 @@
4
5	DEFINES = -DAPPDEFDIR=\"$(DESTDIR)$(XAPPLOADDIR)\" \
6	-DPIXMAPDIR=\"$(DESTDIR)$(PIXMAPDIR)\"
7	-CDEBUGFLAGS = -O2
8	+CFLAGS ?= -Wall -O2
9
10	ComplexProgramTarget(xxkb)
11
12	-InstallAppDefaults(XXkb)
13	-InstallMultiple ($(PIXMAPS),$(PIXMAPDIR))

Lines 1-14 Link Here

(-)xxkb/files/patch-resource.c (-14 lines)
1
2	$FreeBSD: ports/x11/xxkb/files/patch-resource.c,v 1.3 2004/08/14 10:45:15 krion Exp $
3
4	--- resource.c.orig Sat Nov 30 15:34:12 2002
5	+++ resource.c Sat Aug 14 11:48:57 2004
6	@@ -383,7 +383,7 @@
7	case XpmNoMemory:
8	printf("No memory for open xpm file: %s\n", name);
9	break;
10	- default:
11	+ default: break;
12	}
13	}
14