View | Details | Raw Unified | Return to bug 155537 | Differences between
and this patch

Collapse All | Expand All

(-)xneur/Makefile (-20 / +16 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	xneur
8
PORTNAME=	xneur
9
PORTVERSION=	0.10.0
9
PORTVERSION=	0.12.0
10
CATEGORIES=	deskutils
10
CATEGORIES=	deskutils
11
MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
11
MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
12
		http://mirror.amdmi3.ru/distfiles/
12
		http://mirror.amdmi3.ru/distfiles/
Lines 14-28 Link Here
14
MAINTAINER=	admin@lissyara.su
14
MAINTAINER=	admin@lissyara.su
15
COMMENT=	Auto keyboard switcher
15
COMMENT=	Auto keyboard switcher
16
16
17
LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
17
LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
18
		pcre.0:${PORTSDIR}/devel/pcre
18
19
19
USE_BZIP2=	yes
20
USE_BZIP2=	yes
20
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
21
USE_GNOME=	pkgconfig gnomehack
22
USE_GNOME=	pkgconfig gnomehack
22
USE_ICONV=	yes
23
USE_ICONV=	yes
23
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
24
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
25
CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
24
CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
26
CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
25
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
27
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
26
		LDFLAGS="${LDFLAGS}"
28
		LDFLAGS="${LDFLAGS}"
27
29
28
USE_LDCONFIG=	yes
30
USE_LDCONFIG=	yes
Lines 32-38 Link Here
32
34
33
OPTIONS=	GSTREAMER	"Build with GStreamer sound support"	on \
35
OPTIONS=	GSTREAMER	"Build with GStreamer sound support"	on \
34
		OPENAL		"Build with OpenAL sound support"	off \
36
		OPENAL		"Build with OpenAL sound support"	off \
35
		PCRE		"Build with libpcre support"		on \
36
		ASPELL		"Build with aspell support"		on \
37
		ASPELL		"Build with aspell support"		on \
37
		XOSD		"Build with xosd support"		off
38
		XOSD		"Build with xosd support"		off
38
39
Lines 40-46 Link Here
40
41
41
.if !defined(WITHOUT_NLS)
42
.if !defined(WITHOUT_NLS)
42
USE_GETTEXT=	yes
43
USE_GETTEXT=	yes
43
LDFLAGS+=	-lintl
44
CONFIGURE_ARGS+=	--enable-nls
44
PLIST_SUB+=	NLS=""
45
PLIST_SUB+=	NLS=""
45
.else
46
.else
46
CONFIGURE_ARGS+=	--disable-nls
47
CONFIGURE_ARGS+=	--disable-nls
Lines 48-68 Link Here
48
.endif
49
.endif
49
50
50
.if defined(WITHOUT_X11)
51
.if defined(WITHOUT_X11)
51
CONFIGURE_ARGS+=	--with-x=no
52
CONFIGURE_ARGS+=	--without-x
52
.else
53
.else
53
USE_XORG+=	x11
54
USE_XORG+=	x11
54
CONFIGURE_ARGS+=	--with-x
55
CONFIGURE_ARGS+=	--with-x
55
.endif
56
.endif
56
57
57
.if !defined(WITHOUT_GSTREAMER) && defined(WITH_OPENAL)
58
.if !defined(WITHOUT_GSTREAMER) && defined(WITH_OPENAL)
58
IGNORE=	please select support one of the sound library
59
IGNORE=	please select only one sound library
59
.else
60
.else
60
.if !defined(WITHOUT_GSTREAMER)
61
.if !defined(WITHOUT_GSTREAMER)
61
USE_GSTREAMER=	yes
62
USE_GSTREAMER=	yes
62
CONFIGURE_ARGS+=	--with-sound=gstreamer
63
CONFIGURE_ARGS+=	--with-sound=gstreamer
63
.endif
64
.endif
64
.if defined(WITH_OPENAL)
65
.if defined(WITH_OPENAL)
65
USE_OPENAL=		al
66
USE_OPENAL=		al alut
66
CONFIGURE_ARGS+=	--with-sound=openal
67
CONFIGURE_ARGS+=	--with-sound=openal
67
.endif
68
.endif
68
.if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL)
69
.if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL)
Lines 70-100 Link Here
70
.endif
71
.endif
71
.endif
72
.endif
72
73
73
.if defined(WITHOUT_PCRE)
74
CONFIGURE_ARGS+=	--without-pcre
75
.else
76
LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
77
.endif
78
79
.if defined(WITHOUT_ASPELL)
74
.if defined(WITHOUT_ASPELL)
80
CONFIGURE_ARGS+=	--without-aspell
75
CONFIGURE_ARGS+=	--with-spell=no --without-aspell
81
.else
76
.else
82
LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
77
LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
78
CONFIGURE_ARGS+=	--with-spell=aspell
83
.endif
79
.endif
84
80
85
.if !defined(WITH_XOSD)
81
.if !defined(WITH_XOSD)
86
CONFIGURE_ARGS+=	--without-xosd
82
CONFIGURE_ARGS+=	--without-xosd
87
.else
83
.else
88
LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
84
LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
85
CONFIGURE_ARGS+=	--with-xosd
89
.endif
86
.endif
90
87
91
post-patch:
88
post-patch:
92
	@${REINPLACE_CMD} -e '/^CFLAGS=/s|="|="$$CFLAGS |' ${WRKSRC}/configure
89
	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
93
	@${REINPLACE_CMD} -e 's|	xneurrc	|xneurrc.dist|g' ${WRKSRC}/etc/Makefile.in
94
	${CP} -np ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.dist
95
90
96
post-install:
91
post-install:
97
	@for i in ${PREFIX}/etc/xneur/*.dist ;\
92
.if !exists(${PREFIX}/etc/xneur/xneurrc)
98
		do ${CP} -np $$i $${i%.dist}; done
93
	${CP} -p ${PREFIX}/etc/xneur/xneurrc.sample ${PREFIX}/etc/xneur/xneurrc
94
.endif
99
95
100
.include <bsd.port.post.mk>
96
.include <bsd.port.post.mk>
(-)xneur/distinfo (-3 / +2 lines)
Lines 1-3 Link Here
1
MD5 (xneur-0.10.0.tar.bz2) = 256260b8fdafcffc786d0a1ee0525506
1
SHA256 (xneur-0.12.0.tar.bz2) = 962660306f138de44fbfcb458fffac59ce32000a49e2314e4f0460a98ac93327
2
SHA256 (xneur-0.10.0.tar.bz2) = 0e118ccf02a654c0c94e1faac254c9df224b63f5296d79806c7b1566b90204ca
2
SIZE (xneur-0.12.0.tar.bz2) = 1088554
3
SIZE (xneur-0.10.0.tar.bz2) = 1120059
(-)xneur/pkg-plist (-46 / +27 lines)
Lines 1-11 Link Here
1
bin/xneur
1
bin/xneur
2
@unexec if cmp -s %D/etc/xneur/xneurrc %D/etc/xneur/xneurrc.dist; then rm -f %D/etc/xneur/xneurrc; fi
2
@unexec if cmp -s %D/etc/xneur/xneurrc.sample %D/etc/xneur/xneurrc; then rm -f %D/etc/xneur/xneurrc; fi
3
etc/xneur/xneurrc.dist
3
etc/xneur/xneurrc.sample
4
@exec if [ ! -f %D/etc/xneur/xneurrc ] ; then cp -p %D/%F %B/xneurrc; fi
4
@dirrmtry etc/xneur
5
@dirrmtry etc/xneur
5
lib/xneur/libxneur.so.10
6
lib/xneur/libxneur.so.12
6
lib/xneur/libxneur.so
7
lib/xneur/libxneur.so
7
lib/xneur/libxneur.la
8
lib/xneur/libxneur.la
8
lib/xneur/libxnconfig.so.10
9
lib/xneur/libxnconfig.so.12
9
lib/xneur/libxnconfig.so
10
lib/xneur/libxnconfig.so
10
lib/xneur/libxnconfig.la
11
lib/xneur/libxnconfig.la
11
lib/xneur/xneur/libxntest.so.0
12
lib/xneur/xneur/libxntest.so.0
Lines 28-140 Link Here
28
%%DATADIR%%/sounds/switch.wav
29
%%DATADIR%%/sounds/switch.wav
29
%%DATADIR%%/sounds/itemback.wav
30
%%DATADIR%%/sounds/itemback.wav
30
@dirrm %%DATADIR%%/sounds
31
@dirrm %%DATADIR%%/sounds
31
%%DATADIR%%/languages/am/dict
32
%%DATADIR%%/languages/am/proto
32
%%DATADIR%%/languages/am/proto
33
%%DATADIR%%/languages/am/proto3
33
%%DATADIR%%/languages/am/proto3
34
%%DATADIR%%/languages/am/regexp
34
%%DATADIR%%/languages/am/dictionary
35
@dirrm %%DATADIR%%/languages/am
35
@dirrm %%DATADIR%%/languages/am
36
%%DATADIR%%/languages/bg/dict
37
%%DATADIR%%/languages/bg/proto
36
%%DATADIR%%/languages/bg/proto
38
%%DATADIR%%/languages/bg/proto3
37
%%DATADIR%%/languages/bg/proto3
39
%%DATADIR%%/languages/bg/regexp
38
%%DATADIR%%/languages/bg/dictionary
40
@dirrm %%DATADIR%%/languages/bg
39
@dirrm %%DATADIR%%/languages/bg
41
%%DATADIR%%/languages/by/dict
42
%%DATADIR%%/languages/by/proto
40
%%DATADIR%%/languages/by/proto
43
%%DATADIR%%/languages/by/proto3
41
%%DATADIR%%/languages/by/proto3
44
%%DATADIR%%/languages/by/regexp
42
%%DATADIR%%/languages/by/dictionary
45
@dirrm %%DATADIR%%/languages/by
43
@dirrm %%DATADIR%%/languages/by
46
%%DATADIR%%/languages/cz/dict
47
%%DATADIR%%/languages/cz/proto
44
%%DATADIR%%/languages/cz/proto
48
%%DATADIR%%/languages/cz/proto3
45
%%DATADIR%%/languages/cz/proto3
49
%%DATADIR%%/languages/cz/regexp
46
%%DATADIR%%/languages/cz/dictionary
50
@dirrm %%DATADIR%%/languages/cz
47
@dirrm %%DATADIR%%/languages/cz
51
%%DATADIR%%/languages/de/dict
52
%%DATADIR%%/languages/de/proto
48
%%DATADIR%%/languages/de/proto
53
%%DATADIR%%/languages/de/proto3
49
%%DATADIR%%/languages/de/proto3
54
%%DATADIR%%/languages/de/regexp
50
%%DATADIR%%/languages/de/dictionary
55
@dirrm %%DATADIR%%/languages/de
51
@dirrm %%DATADIR%%/languages/de
56
%%DATADIR%%/languages/ge/dict
57
%%DATADIR%%/languages/ge/proto
52
%%DATADIR%%/languages/ge/proto
58
%%DATADIR%%/languages/ge/proto3
53
%%DATADIR%%/languages/ge/proto3
59
%%DATADIR%%/languages/ge/regexp
54
%%DATADIR%%/languages/ge/dictionary
60
@dirrm %%DATADIR%%/languages/ge
55
@dirrm %%DATADIR%%/languages/ge
61
%%DATADIR%%/languages/gr/dict
62
%%DATADIR%%/languages/gr/proto
56
%%DATADIR%%/languages/gr/proto
63
%%DATADIR%%/languages/gr/proto3
57
%%DATADIR%%/languages/gr/proto3
64
%%DATADIR%%/languages/gr/regexp
58
%%DATADIR%%/languages/gr/dictionary
65
@dirrm %%DATADIR%%/languages/gr
59
@dirrm %%DATADIR%%/languages/gr
66
%%DATADIR%%/languages/ee/dict
67
%%DATADIR%%/languages/ee/proto
60
%%DATADIR%%/languages/ee/proto
68
%%DATADIR%%/languages/ee/proto3
61
%%DATADIR%%/languages/ee/proto3
69
%%DATADIR%%/languages/ee/regexp
62
%%DATADIR%%/languages/ee/dictionary
70
@dirrm %%DATADIR%%/languages/ee
63
@dirrm %%DATADIR%%/languages/ee
71
%%DATADIR%%/languages/en/dict
72
%%DATADIR%%/languages/en/proto
64
%%DATADIR%%/languages/en/proto
73
%%DATADIR%%/languages/en/proto3
65
%%DATADIR%%/languages/en/proto3
74
%%DATADIR%%/languages/en/regexp
66
%%DATADIR%%/languages/en/dictionary
75
@dirrm %%DATADIR%%/languages/en
67
@dirrm %%DATADIR%%/languages/en
76
%%DATADIR%%/languages/es/dict
77
%%DATADIR%%/languages/es/proto
68
%%DATADIR%%/languages/es/proto
78
%%DATADIR%%/languages/es/proto3
69
%%DATADIR%%/languages/es/proto3
79
%%DATADIR%%/languages/es/regexp
70
%%DATADIR%%/languages/es/dictionary
80
@dirrm %%DATADIR%%/languages/es
71
@dirrm %%DATADIR%%/languages/es
81
%%DATADIR%%/languages/fr/dict
82
%%DATADIR%%/languages/fr/proto
72
%%DATADIR%%/languages/fr/proto
83
%%DATADIR%%/languages/fr/proto3
73
%%DATADIR%%/languages/fr/proto3
84
%%DATADIR%%/languages/fr/regexp
74
%%DATADIR%%/languages/fr/dictionary
85
@dirrm %%DATADIR%%/languages/fr
75
@dirrm %%DATADIR%%/languages/fr
86
%%DATADIR%%/languages/gb/dict
87
%%DATADIR%%/languages/gb/proto
76
%%DATADIR%%/languages/gb/proto
88
%%DATADIR%%/languages/gb/proto3
77
%%DATADIR%%/languages/gb/proto3
89
%%DATADIR%%/languages/gb/regexp
78
%%DATADIR%%/languages/gb/dictionary
90
@dirrm %%DATADIR%%/languages/gb
79
@dirrm %%DATADIR%%/languages/gb
91
%%DATADIR%%/languages/kz/dict
92
%%DATADIR%%/languages/kz/proto
80
%%DATADIR%%/languages/kz/proto
93
%%DATADIR%%/languages/kz/proto3
81
%%DATADIR%%/languages/kz/proto3
94
%%DATADIR%%/languages/kz/regexp
82
%%DATADIR%%/languages/kz/dictionary
95
@dirrm %%DATADIR%%/languages/kz
83
@dirrm %%DATADIR%%/languages/kz
96
%%DATADIR%%/languages/lt/dict
97
%%DATADIR%%/languages/lt/proto
84
%%DATADIR%%/languages/lt/proto
98
%%DATADIR%%/languages/lt/proto3
85
%%DATADIR%%/languages/lt/proto3
99
%%DATADIR%%/languages/lt/regexp
86
%%DATADIR%%/languages/lt/dictionary
100
@dirrm %%DATADIR%%/languages/lt
87
@dirrm %%DATADIR%%/languages/lt
101
%%DATADIR%%/languages/lv/dict
102
%%DATADIR%%/languages/lv/proto
88
%%DATADIR%%/languages/lv/proto
103
%%DATADIR%%/languages/lv/proto3
89
%%DATADIR%%/languages/lv/proto3
104
%%DATADIR%%/languages/lv/regexp
90
%%DATADIR%%/languages/lv/dictionary
105
@dirrm %%DATADIR%%/languages/lv
91
@dirrm %%DATADIR%%/languages/lv
106
%%DATADIR%%/languages/pl/dict
107
%%DATADIR%%/languages/pl/proto
92
%%DATADIR%%/languages/pl/proto
108
%%DATADIR%%/languages/pl/proto3
93
%%DATADIR%%/languages/pl/proto3
109
%%DATADIR%%/languages/pl/regexp
94
%%DATADIR%%/languages/pl/dictionary
110
@dirrm %%DATADIR%%/languages/pl
95
@dirrm %%DATADIR%%/languages/pl
111
%%DATADIR%%/languages/ro/dict
112
%%DATADIR%%/languages/ro/proto
96
%%DATADIR%%/languages/ro/proto
113
%%DATADIR%%/languages/ro/proto3
97
%%DATADIR%%/languages/ro/proto3
114
%%DATADIR%%/languages/ro/regexp
98
%%DATADIR%%/languages/ro/dictionary
115
@dirrm %%DATADIR%%/languages/ro
99
@dirrm %%DATADIR%%/languages/ro
116
%%DATADIR%%/languages/ru/dict
117
%%DATADIR%%/languages/ru/proto
100
%%DATADIR%%/languages/ru/proto
118
%%DATADIR%%/languages/ru/proto3
101
%%DATADIR%%/languages/ru/proto3
119
%%DATADIR%%/languages/ru/regexp
102
%%DATADIR%%/languages/ru/dictionary
120
@dirrm %%DATADIR%%/languages/ru
103
@dirrm %%DATADIR%%/languages/ru
121
%%DATADIR%%/languages/ua/dict
122
%%DATADIR%%/languages/ua/proto
104
%%DATADIR%%/languages/ua/proto
123
%%DATADIR%%/languages/ua/proto3
105
%%DATADIR%%/languages/ua/proto3
124
%%DATADIR%%/languages/ua/regexp
106
%%DATADIR%%/languages/ua/dictionary
125
@dirrm %%DATADIR%%/languages/ua
107
@dirrm %%DATADIR%%/languages/ua
126
%%DATADIR%%/languages/us/dict
127
%%DATADIR%%/languages/us/proto
108
%%DATADIR%%/languages/us/proto
128
%%DATADIR%%/languages/us/proto3
109
%%DATADIR%%/languages/us/proto3
129
%%DATADIR%%/languages/us/regexp
110
%%DATADIR%%/languages/us/dictionary
130
@dirrm %%DATADIR%%/languages/us
111
@dirrm %%DATADIR%%/languages/us
131
%%DATADIR%%/languages/uz/dict
132
%%DATADIR%%/languages/uz/proto
112
%%DATADIR%%/languages/uz/proto
133
%%DATADIR%%/languages/uz/proto3
113
%%DATADIR%%/languages/uz/proto3
134
%%DATADIR%%/languages/uz/regexp
114
%%DATADIR%%/languages/uz/dictionary
135
@dirrm %%DATADIR%%/languages/uz
115
@dirrm %%DATADIR%%/languages/uz
136
@dirrm %%DATADIR%%/languages
116
@dirrm %%DATADIR%%/languages
137
@dirrm %%DATADIR%%
117
@dirrm %%DATADIR%%
118
%%NLS%%share/locale/be/LC_MESSAGES/xneur.mo
138
%%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
119
%%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
139
%%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
120
%%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
140
%%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo
121
%%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo
(-)xneur/files/patch-configure (+11 lines)
Added Link Here
1
--- configure.orig	2011-03-13 20:00:53.000000000 +0300
2
+++ configure	2011-03-13 20:01:47.000000000 +0300
3
@@ -13690,7 +13690,7 @@
4
 
5
 fi
6
 
7
-ADDITIONAL_LIBS="-pthread -ldl"
8
+ADDITIONAL_LIBS="-pthread"
9
 
10
 
11
 
(-)xneur/files/patch-etc-Makefile.in (+11 lines)
Added Link Here
1
--- etc/Makefile.in.orig	2011-03-17 06:55:24.700517870 +0100
2
+++ etc/Makefile.in	2011-03-17 06:57:38.716913390 +0100
3
@@ -230,7 +230,7 @@
4
 top_srcdir = @top_srcdir@
5
 xneurrcdir = $(sysconfdir)/xneur
6
 xneurrc_DATA = \
7
-	xneurrc	
8
+	xneurrc.sample
9
 
10
 EXTRA_DIST = $(xneurrc_DATA)
11
 all: all-am

Return to bug 155537