* [gentoo-commits] gentoo-x86 commit in net-misc/neatx/files: neatx-0.3.1_p59-use_libexecdir.patch
@ 2012-08-21 13:34 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2012-08-21 13:34 UTC (permalink / raw
To: gentoo-commits
voyageur 12/08/21 13:34:00
Added: neatx-0.3.1_p59-use_libexecdir.patch
Log:
Use libexecdir instead of libdir (error in newer automake), bug #428626. Inherit user eclass
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Revision Changes Path
1.1 net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?rev=1.1&content-type=text/plain
Index: neatx-0.3.1_p59-use_libexecdir.patch
===================================================================
diff -Naur neatx.orig/Makefile.am neatx/Makefile.am
--- neatx.orig/Makefile.am 2012-08-21 12:09:25.504181479 +0200
+++ neatx/Makefile.am 2012-08-21 12:11:55.254498131 +0200
@@ -16,7 +16,7 @@
appdir = $(pkgpythondir)/app
docdir = $(datadir)/doc/$(PACKAGE)
-AM_CFLAGS = -Wall -Werror -DPKGLIBDIR=\"$(pkglibdir)\"
+AM_CFLAGS = -Wall -Werror -DPKGLIBEXECDIR=\"$(pkglibexecdir)\"
DIRS = \
autotools \
@@ -70,14 +70,14 @@
lib/app/nxserver.py \
lib/app/nxserver_login.py
-dist_pkglib_SCRIPTS = \
+dist_pkglibexec_SCRIPTS = \
src/ttysetup
-nodist_pkglib_SCRIPTS = \
+nodist_pkglibexec_SCRIPTS = \
$(LOG_WRAPPER) \
$(PYTHON_BOOTSTRAP)
-pkglib_PROGRAMS = \
+pkglibexec_PROGRAMS = \
src/fdcopy
dist_pkgdata_DATA = \
@@ -173,7 +173,7 @@
echo "VERSION_FULL = '$(VERSION_FULL)'"; \
echo "LOCALSTATEDIR = '$(localstatedir)'"; \
echo "SYSCONFDIR = '$(sysconfdir)'"; \
- echo "PKGLIBDIR = '$(pkglibdir)'"; \
+ echo "PKGLIBEXECDIR = '$(pkglibexecdir)'"; \
} > $@
$(REPLACE_VARS_SED): Makefile stamp-directories
@@ -182,7 +182,7 @@
echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
echo 's#@SBINDIR@#$(sbindir)#g'; \
- echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
+ echo 's#@PKGLIBEXECDIR@#$(pkglibexecdir)#g'; \
echo 's#@PKGPYTHONDIR@#$(pkgpythondir)#g'; \
} > $@
@@ -206,7 +206,7 @@
# files when building.
srclinks: stamp-directories
set -e; \
- for i in $(pkgpython_PYTHON) $(app_PYTHON) $(dist_pkglib_SCRIPTS); do \
+ for i in $(pkgpython_PYTHON) $(app_PYTHON) $(dist_pkglibexec_SCRIPTS); do \
if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
$(LN_S) $(abs_top_srcdir)/$$i $$i; \
fi; \
diff -Naur neatx.orig/lib/constants.py neatx/lib/constants.py
--- neatx.orig/lib/constants.py 2012-08-21 12:09:25.504181479 +0200
+++ neatx/lib/constants.py 2012-08-21 12:12:46.964539145 +0200
@@ -40,14 +40,14 @@
START_GNOME_COMMAND = "gnome-session"
NXUSER = "nx"
-NXSERVER = _autoconf.PKGLIBDIR + "/nxserver"
-NXNODE = _autoconf.PKGLIBDIR + "/nxnode"
-NXNODE_WRAPPER = _autoconf.PKGLIBDIR + "/nxnode-wrapper"
-NXNC = _autoconf.PKGLIBDIR + "/nxnc"
-NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog"
+NXSERVER = _autoconf.PKGLIBEXECDIR + "/nxserver"
+NXNODE = _autoconf.PKGLIBEXECDIR + "/nxnode"
+NXNODE_WRAPPER = _autoconf.PKGLIBEXECDIR + "/nxnode-wrapper"
+NXNC = _autoconf.PKGLIBEXECDIR + "/nxnc"
+NXDIALOG = _autoconf.PKGLIBEXECDIR + "/nxdialog"
NXAGENT_PKGNAME = "nxagent"
-FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy"
-TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup"
+FDCOPY = _autoconf.PKGLIBEXECDIR + "/fdcopy"
+TTYSETUP = _autoconf.PKGLIBEXECDIR + "/ttysetup"
NXAGENT_VERSION_SEP = ".-~"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/neatx/files: neatx-0.3.1_p59-use_libexecdir.patch
@ 2012-08-23 12:30 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2012-08-23 12:30 UTC (permalink / raw
To: gentoo-commits
voyageur 12/08/23 12:30:40
Modified: neatx-0.3.1_p59-use_libexecdir.patch
Log:
Fix missing parts for libexecdir migration, thanks Damien Granger in bug #432274
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
Revision Changes Path
1.2 net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?r1=1.1&r2=1.2
Index: neatx-0.3.1_p59-use_libexecdir.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- neatx-0.3.1_p59-use_libexecdir.patch 21 Aug 2012 13:34:00 -0000 1.1
+++ neatx-0.3.1_p59-use_libexecdir.patch 23 Aug 2012 12:30:40 -0000 1.2
@@ -1,6 +1,6 @@
diff -Naur neatx.orig/Makefile.am neatx/Makefile.am
---- neatx.orig/Makefile.am 2012-08-21 12:09:25.504181479 +0200
-+++ neatx/Makefile.am 2012-08-21 12:11:55.254498131 +0200
+--- neatx.orig/Makefile.am 2012-08-23 12:01:14.290018757 +0200
++++ neatx/Makefile.am 2012-08-23 14:16:42.119497905 +0200
@@ -16,7 +16,7 @@
appdir = $(pkgpythondir)/app
docdir = $(datadir)/doc/$(PACKAGE)
@@ -46,7 +46,15 @@
echo 's#@PKGPYTHONDIR@#$(pkgpythondir)#g'; \
} > $@
-@@ -206,7 +206,7 @@
+@@ -199,14 +199,14 @@
+ $(LOG_WRAPPER): Makefile stamp-directories $(GEN_LOG_WRAPPER)
+ set -e; \
+ progname=`basename $@ | sed -e 's/-wrapper//'`; \
+- $(GEN_LOG_WRAPPER) "$(pkglibdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@
++ $(GEN_LOG_WRAPPER) "$(pkglibexecdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@
+ chmod u+x $@
+
+ # We need to create symlinks because "make distcheck" will not install Python
# files when building.
srclinks: stamp-directories
set -e; \
@@ -56,8 +64,8 @@
$(LN_S) $(abs_top_srcdir)/$$i $$i; \
fi; \
diff -Naur neatx.orig/lib/constants.py neatx/lib/constants.py
---- neatx.orig/lib/constants.py 2012-08-21 12:09:25.504181479 +0200
-+++ neatx/lib/constants.py 2012-08-21 12:12:46.964539145 +0200
+--- neatx.orig/lib/constants.py 2012-08-23 12:01:14.290018757 +0200
++++ neatx/lib/constants.py 2012-08-23 12:01:23.405734335 +0200
@@ -40,14 +40,14 @@
START_GNOME_COMMAND = "gnome-session"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/neatx/files: neatx-0.3.1_p59-use_libexecdir.patch
@ 2015-04-26 12:25 Pacho Ramos (pacho)
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos (pacho) @ 2015-04-26 12:25 UTC (permalink / raw
To: gentoo-commits
pacho 15/04/26 12:25:42
Removed: neatx-0.3.1_p59-use_libexecdir.patch
Log:
Remove masked for removal package
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-26 12:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-26 12:25 [gentoo-commits] gentoo-x86 commit in net-misc/neatx/files: neatx-0.3.1_p59-use_libexecdir.patch Pacho Ramos (pacho)
-- strict thread matches above, loose matches on Subject: below --
2012-08-23 12:30 Bernard Cafarelli (voyageur)
2012-08-21 13:34 Bernard Cafarelli (voyageur)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox