aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorGanael LAPLANCHE <martymac@FreeBSD.org>2011-04-04 08:26:33 +0000
committerGanael LAPLANCHE <martymac@FreeBSD.org>2011-04-04 08:26:33 +0000
commitee857aa9ec2d7884ae470ec69057f88fd1f27a8f (patch)
tree72364a597fddf38ab384dac7e36302e7e0860b2d /deskutils
parent13d34f341d59e3bdaeac04fe4479e6f720a60402 (diff)
downloadports-ee857aa9ec2d7884ae470ec69057f88fd1f27a8f.tar.gz
ports-ee857aa9ec2d7884ae470ec69057f88fd1f27a8f.zip
- Update to 0.12.0
- Convert PCRE option to a mandatory LIB_DEPENDS - Fix or improve several OPTIONS handling and dependencies - Remove useless CFLAGS patch - Handle sample configuration file as advised in the handbook PR: 155537 Submitted by: Alex Keda <admin@lissyara.su> (maintainer) Approved by: maintainer timeout (18 days)
Notes
Notes: svn path=/head/; revision=272188
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/xneur/Makefile36
-rw-r--r--deskutils/xneur/distinfo4
-rw-r--r--deskutils/xneur/files/patch-configure11
-rw-r--r--deskutils/xneur/files/patch-etc-Makefile.in11
-rw-r--r--deskutils/xneur/pkg-plist73
5 files changed, 67 insertions, 68 deletions
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 29856cea7b41..aa8a63bbebe1 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xneur
-PORTVERSION= 0.10.0
+PORTVERSION= 0.12.0
CATEGORIES= deskutils
MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
http://mirror.amdmi3.ru/distfiles/
@@ -14,15 +14,17 @@ MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
MAINTAINER= admin@lissyara.su
COMMENT= Auto keyboard switcher
-LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
+ pcre.0:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig gnomehack
USE_ICONV= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
@@ -32,7 +34,6 @@ MAN5= xneurrc.5
OPTIONS= GSTREAMER "Build with GStreamer sound support" on \
OPENAL "Build with OpenAL sound support" off \
- PCRE "Build with libpcre support" on \
ASPELL "Build with aspell support" on \
XOSD "Build with xosd support" off
@@ -40,7 +41,7 @@ OPTIONS= GSTREAMER "Build with GStreamer sound support" on \
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-LDFLAGS+= -lintl
+CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
@@ -48,21 +49,21 @@ PLIST_SUB+= NLS="@comment "
.endif
.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --with-x=no
+CONFIGURE_ARGS+= --without-x
.else
USE_XORG+= x11
CONFIGURE_ARGS+= --with-x
.endif
.if !defined(WITHOUT_GSTREAMER) && defined(WITH_OPENAL)
-IGNORE= please select support one of the sound library
+IGNORE= please select only one sound library
.else
.if !defined(WITHOUT_GSTREAMER)
USE_GSTREAMER= yes
CONFIGURE_ARGS+= --with-sound=gstreamer
.endif
.if defined(WITH_OPENAL)
-USE_OPENAL= al
+USE_OPENAL= al alut
CONFIGURE_ARGS+= --with-sound=openal
.endif
.if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL)
@@ -70,31 +71,26 @@ CONFIGURE_ARGS+= --with-sound=no
.endif
.endif
-.if defined(WITHOUT_PCRE)
-CONFIGURE_ARGS+= --without-pcre
-.else
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-.endif
-
.if defined(WITHOUT_ASPELL)
-CONFIGURE_ARGS+= --without-aspell
+CONFIGURE_ARGS+= --with-spell=no --without-aspell
.else
LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+= --with-spell=aspell
.endif
.if !defined(WITH_XOSD)
CONFIGURE_ARGS+= --without-xosd
.else
LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
+CONFIGURE_ARGS+= --with-xosd
.endif
post-patch:
- @${REINPLACE_CMD} -e '/^CFLAGS=/s|="|="$$CFLAGS |' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's| xneurrc |xneurrc.dist|g' ${WRKSRC}/etc/Makefile.in
- ${CP} -np ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.dist
+ @${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
post-install:
- @for i in ${PREFIX}/etc/xneur/*.dist ;\
- do ${CP} -np $$i $${i%.dist}; done
+.if !exists(${PREFIX}/etc/xneur/xneurrc)
+ ${CP} -p ${PREFIX}/etc/xneur/xneurrc.sample ${PREFIX}/etc/xneur/xneurrc
+.endif
.include <bsd.port.post.mk>
diff --git a/deskutils/xneur/distinfo b/deskutils/xneur/distinfo
index 3bb3c5568c36..eb8237a9c09a 100644
--- a/deskutils/xneur/distinfo
+++ b/deskutils/xneur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xneur-0.10.0.tar.bz2) = 0e118ccf02a654c0c94e1faac254c9df224b63f5296d79806c7b1566b90204ca
-SIZE (xneur-0.10.0.tar.bz2) = 1120059
+SHA256 (xneur-0.12.0.tar.bz2) = 962660306f138de44fbfcb458fffac59ce32000a49e2314e4f0460a98ac93327
+SIZE (xneur-0.12.0.tar.bz2) = 1088554
diff --git a/deskutils/xneur/files/patch-configure b/deskutils/xneur/files/patch-configure
new file mode 100644
index 000000000000..3d878eb89c39
--- /dev/null
+++ b/deskutils/xneur/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2011-03-13 20:00:53.000000000 +0300
++++ configure 2011-03-13 20:01:47.000000000 +0300
+@@ -13690,7 +13690,7 @@
+
+ fi
+
+-ADDITIONAL_LIBS="-pthread -ldl"
++ADDITIONAL_LIBS="-pthread"
+
+
+
diff --git a/deskutils/xneur/files/patch-etc-Makefile.in b/deskutils/xneur/files/patch-etc-Makefile.in
new file mode 100644
index 000000000000..9ee304088411
--- /dev/null
+++ b/deskutils/xneur/files/patch-etc-Makefile.in
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig 2011-03-17 06:55:24.700517870 +0100
++++ etc/Makefile.in 2011-03-17 06:57:38.716913390 +0100
+@@ -230,7 +230,7 @@
+ top_srcdir = @top_srcdir@
+ xneurrcdir = $(sysconfdir)/xneur
+ xneurrc_DATA = \
+- xneurrc
++ xneurrc.sample
+
+ EXTRA_DIST = $(xneurrc_DATA)
+ all: all-am
diff --git a/deskutils/xneur/pkg-plist b/deskutils/xneur/pkg-plist
index 620a5593f1ee..0cc34d9fc93e 100644
--- a/deskutils/xneur/pkg-plist
+++ b/deskutils/xneur/pkg-plist
@@ -1,11 +1,12 @@
bin/xneur
-@unexec if cmp -s %D/etc/xneur/xneurrc %D/etc/xneur/xneurrc.dist; then rm -f %D/etc/xneur/xneurrc; fi
-etc/xneur/xneurrc.dist
+@unexec if cmp -s %D/etc/xneur/xneurrc.sample %D/etc/xneur/xneurrc; then rm -f %D/etc/xneur/xneurrc; fi
+etc/xneur/xneurrc.sample
+@exec if [ ! -f %D/etc/xneur/xneurrc ] ; then cp -p %D/%F %B/xneurrc; fi
@dirrmtry etc/xneur
-lib/xneur/libxneur.so.10
+lib/xneur/libxneur.so.12
lib/xneur/libxneur.so
lib/xneur/libxneur.la
-lib/xneur/libxnconfig.so.10
+lib/xneur/libxnconfig.so.12
lib/xneur/libxnconfig.so
lib/xneur/libxnconfig.la
lib/xneur/xneur/libxntest.so.0
@@ -28,113 +29,93 @@ include/xneur/xnconfig.h
%%DATADIR%%/sounds/switch.wav
%%DATADIR%%/sounds/itemback.wav
@dirrm %%DATADIR%%/sounds
-%%DATADIR%%/languages/am/dict
%%DATADIR%%/languages/am/proto
%%DATADIR%%/languages/am/proto3
-%%DATADIR%%/languages/am/regexp
+%%DATADIR%%/languages/am/dictionary
@dirrm %%DATADIR%%/languages/am
-%%DATADIR%%/languages/bg/dict
%%DATADIR%%/languages/bg/proto
%%DATADIR%%/languages/bg/proto3
-%%DATADIR%%/languages/bg/regexp
+%%DATADIR%%/languages/bg/dictionary
@dirrm %%DATADIR%%/languages/bg
-%%DATADIR%%/languages/by/dict
%%DATADIR%%/languages/by/proto
%%DATADIR%%/languages/by/proto3
-%%DATADIR%%/languages/by/regexp
+%%DATADIR%%/languages/by/dictionary
@dirrm %%DATADIR%%/languages/by
-%%DATADIR%%/languages/cz/dict
%%DATADIR%%/languages/cz/proto
%%DATADIR%%/languages/cz/proto3
-%%DATADIR%%/languages/cz/regexp
+%%DATADIR%%/languages/cz/dictionary
@dirrm %%DATADIR%%/languages/cz
-%%DATADIR%%/languages/de/dict
%%DATADIR%%/languages/de/proto
%%DATADIR%%/languages/de/proto3
-%%DATADIR%%/languages/de/regexp
+%%DATADIR%%/languages/de/dictionary
@dirrm %%DATADIR%%/languages/de
-%%DATADIR%%/languages/ge/dict
%%DATADIR%%/languages/ge/proto
%%DATADIR%%/languages/ge/proto3
-%%DATADIR%%/languages/ge/regexp
+%%DATADIR%%/languages/ge/dictionary
@dirrm %%DATADIR%%/languages/ge
-%%DATADIR%%/languages/gr/dict
%%DATADIR%%/languages/gr/proto
%%DATADIR%%/languages/gr/proto3
-%%DATADIR%%/languages/gr/regexp
+%%DATADIR%%/languages/gr/dictionary
@dirrm %%DATADIR%%/languages/gr
-%%DATADIR%%/languages/ee/dict
%%DATADIR%%/languages/ee/proto
%%DATADIR%%/languages/ee/proto3
-%%DATADIR%%/languages/ee/regexp
+%%DATADIR%%/languages/ee/dictionary
@dirrm %%DATADIR%%/languages/ee
-%%DATADIR%%/languages/en/dict
%%DATADIR%%/languages/en/proto
%%DATADIR%%/languages/en/proto3
-%%DATADIR%%/languages/en/regexp
+%%DATADIR%%/languages/en/dictionary
@dirrm %%DATADIR%%/languages/en
-%%DATADIR%%/languages/es/dict
%%DATADIR%%/languages/es/proto
%%DATADIR%%/languages/es/proto3
-%%DATADIR%%/languages/es/regexp
+%%DATADIR%%/languages/es/dictionary
@dirrm %%DATADIR%%/languages/es
-%%DATADIR%%/languages/fr/dict
%%DATADIR%%/languages/fr/proto
%%DATADIR%%/languages/fr/proto3
-%%DATADIR%%/languages/fr/regexp
+%%DATADIR%%/languages/fr/dictionary
@dirrm %%DATADIR%%/languages/fr
-%%DATADIR%%/languages/gb/dict
%%DATADIR%%/languages/gb/proto
%%DATADIR%%/languages/gb/proto3
-%%DATADIR%%/languages/gb/regexp
+%%DATADIR%%/languages/gb/dictionary
@dirrm %%DATADIR%%/languages/gb
-%%DATADIR%%/languages/kz/dict
%%DATADIR%%/languages/kz/proto
%%DATADIR%%/languages/kz/proto3
-%%DATADIR%%/languages/kz/regexp
+%%DATADIR%%/languages/kz/dictionary
@dirrm %%DATADIR%%/languages/kz
-%%DATADIR%%/languages/lt/dict
%%DATADIR%%/languages/lt/proto
%%DATADIR%%/languages/lt/proto3
-%%DATADIR%%/languages/lt/regexp
+%%DATADIR%%/languages/lt/dictionary
@dirrm %%DATADIR%%/languages/lt
-%%DATADIR%%/languages/lv/dict
%%DATADIR%%/languages/lv/proto
%%DATADIR%%/languages/lv/proto3
-%%DATADIR%%/languages/lv/regexp
+%%DATADIR%%/languages/lv/dictionary
@dirrm %%DATADIR%%/languages/lv
-%%DATADIR%%/languages/pl/dict
%%DATADIR%%/languages/pl/proto
%%DATADIR%%/languages/pl/proto3
-%%DATADIR%%/languages/pl/regexp
+%%DATADIR%%/languages/pl/dictionary
@dirrm %%DATADIR%%/languages/pl
-%%DATADIR%%/languages/ro/dict
%%DATADIR%%/languages/ro/proto
%%DATADIR%%/languages/ro/proto3
-%%DATADIR%%/languages/ro/regexp
+%%DATADIR%%/languages/ro/dictionary
@dirrm %%DATADIR%%/languages/ro
-%%DATADIR%%/languages/ru/dict
%%DATADIR%%/languages/ru/proto
%%DATADIR%%/languages/ru/proto3
-%%DATADIR%%/languages/ru/regexp
+%%DATADIR%%/languages/ru/dictionary
@dirrm %%DATADIR%%/languages/ru
-%%DATADIR%%/languages/ua/dict
%%DATADIR%%/languages/ua/proto
%%DATADIR%%/languages/ua/proto3
-%%DATADIR%%/languages/ua/regexp
+%%DATADIR%%/languages/ua/dictionary
@dirrm %%DATADIR%%/languages/ua
-%%DATADIR%%/languages/us/dict
%%DATADIR%%/languages/us/proto
%%DATADIR%%/languages/us/proto3
-%%DATADIR%%/languages/us/regexp
+%%DATADIR%%/languages/us/dictionary
@dirrm %%DATADIR%%/languages/us
-%%DATADIR%%/languages/uz/dict
%%DATADIR%%/languages/uz/proto
%%DATADIR%%/languages/uz/proto3
-%%DATADIR%%/languages/uz/regexp
+%%DATADIR%%/languages/uz/dictionary
@dirrm %%DATADIR%%/languages/uz
@dirrm %%DATADIR%%/languages
@dirrm %%DATADIR%%
+%%NLS%%share/locale/be/LC_MESSAGES/xneur.mo
%%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
%%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo