diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-12-25 01:35:28 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-12-25 01:35:28 +0000 |
commit | b07dfc63ea7b741563fa9e7b67b6250c7a72e95d (patch) | |
tree | 0b8b1e2cf99abb93c8720edace5bc05ea524424e /deskutils/xneur | |
parent | Replace gnomehack by pathfix (diff) |
Replace gnomhack by pathfix
Use post-patch to cleanup the configure script instead of a patch
Strip binaries
Notes
Notes:
svn path=/head/; revision=375510
Diffstat (limited to 'deskutils/xneur')
-rw-r--r-- | deskutils/xneur/Makefile | 5 | ||||
-rw-r--r-- | deskutils/xneur/files/patch-configure | 20 |
2 files changed, 3 insertions, 22 deletions
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile index 58d3c16c28c3..cc95f8c850c9 100644 --- a/deskutils/xneur/Makefile +++ b/deskutils/xneur/Makefile @@ -14,8 +14,7 @@ COMMENT= Auto keyboard switcher LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libpcre.so:${PORTSDIR}/devel/pcre -USES= pkgconfig iconv tar:bzip2 libtool -USE_GNOME= gnomehack +USES= pathfix pkgconfig iconv tar:bzip2 libtool GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} @@ -23,6 +22,7 @@ CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur USE_LDCONFIG= yes INSTALLS_ICONS= yes +INSTALL_TARGET= install-strip OPTIONS_DEFINE= ASPELL XOSD NLS X11 OPTIONS_DEFAULT= GSTREAMER ASPELL @@ -73,6 +73,7 @@ CONFIGURE_ARGS+= --without-xosd .endif post-patch: + @${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure @${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample .include <bsd.port.mk> diff --git a/deskutils/xneur/files/patch-configure b/deskutils/xneur/files/patch-configure deleted file mode 100644 index 6c3627ef53d5..000000000000 --- a/deskutils/xneur/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2013-05-23 09:12:45.000000000 +0000 -+++ configure 2013-05-23 09:14:17.000000000 +0000 -@@ -14490,7 +14490,7 @@ - - fi - --ADDITIONAL_LIBS="-pthread -ldl" -+ADDITIONAL_LIBS="-pthread" - - - -@@ -15337,7 +15337,7 @@ - - fi - --DEFAULT_CFLAGS="-Wall -Wextra -Werror -g0 -std=gnu99 -fPIC" -+DEFAULT_CFLAGS="-Wall -Wextra -g0 -std=gnu99 -fPIC" - - - ac_config_files="$ac_config_files pixmaps/Makefile plugins/Makefile plugins/test/Makefile plugins/statistic/Makefile share/Makefile share/sounds/Makefile share/languages/Makefile share/languages/by/Makefile share/languages/bg/Makefile share/languages/cz/Makefile share/languages/de/Makefile share/languages/ge/Makefile share/languages/gr/Makefile share/languages/en/Makefile share/languages/es/Makefile share/languages/ee/Makefile share/languages/fr/Makefile share/languages/gb/Makefile share/languages/am/Makefile share/languages/kz/Makefile share/languages/lt/Makefile share/languages/lv/Makefile share/languages/pl/Makefile share/languages/ro/Makefile share/languages/ru/Makefile share/languages/ua/Makefile share/languages/us/Makefile share/languages/uz/Makefile etc/Makefile lib/Makefile lib/lib/Makefile lib/ai/Makefile lib/config/Makefile lib/misc/Makefile lib/notify/Makefile lib/main/Makefile src/Makefile po/Makefile.in Makefile xnconfig.pc xneur.pc" |