summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-08-13 20:27:43 +0000
committertnn <tnn@pkgsrc.org>2015-08-13 20:27:43 +0000
commit9ad2f42ecdb6124e2573d5e85121c534cdb42e8b (patch)
tree5610a0c8ef1a892a33115ed4dad4bec2b6f6814f /cad
parent91fb7150cb7460f4a2fe3baf3c2fc721a46b3338 (diff)
downloadpkgsrc-9ad2f42ecdb6124e2573d5e85121c534cdb42e8b.tar.gz
- Switch to 32-bit version; 64-bit version has issues with emulation of
pselect6 syscall on NetBSD, leading to high CPU usage (busy polling) - Also ensure QT_XKB_CONFIG_ROOT is set in the environment, otherwise keyboard input might not work. Bump PKGREVISION.
Diffstat (limited to 'cad')
-rw-r--r--cad/eagle/Makefile13
-rw-r--r--cad/eagle/distinfo8
-rw-r--r--cad/eagle/files/eagle6
3 files changed, 16 insertions, 11 deletions
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 2ed2338aa86..756096e73ab 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2015/08/12 17:39:36 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2015/08/13 20:27:43 tnn Exp $
-DISTNAME= eagle-lin64-7.3.0
-PKGNAME= ${DISTNAME:S/-lin64//}
+DISTNAME= eagle-lin32-7.3.0
+PKGREVISION= 1
+PKGNAME= ${DISTNAME:S/-lin32//}
CATEGORIES= cad
MASTER_SITES= http://web.cadsoft.de/ftp/eagle/program/7.3/
EXTRACT_SUFX= .run
@@ -21,13 +22,15 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
USE_TOOLS+= bsdtar bzip2 pax
NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-EMUL_PLATFORMS= linux-x86_64
+EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= x11 freetype2 fontconfig openssl cups krb5
INSTALLATION_DIRS= bin eagle
+QT_XKB_CONFIG_ROOT= ${X11BASE}/share/X11/xkb
+
do-build:
- ${SED} -e "s:@@PREFIX@@:${PREFIX}:g" <${FILESDIR}/eagle >${WRKDIR}/eagle
+ ${SED} -e "s:@@PREFIX@@:${PREFIX}:g" -e "s:@@QT_XKB_CONFIG_ROOT@@:${QT_XKB_CONFIG_ROOT}:g" <${FILESDIR}/eagle >${WRKDIR}/eagle
do-install:
cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/eagle/.
diff --git a/cad/eagle/distinfo b/cad/eagle/distinfo
index 82649d2966b..220f2c85223 100644
--- a/cad/eagle/distinfo
+++ b/cad/eagle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2015/08/12 17:39:36 tnn Exp $
+$NetBSD: distinfo,v 1.10 2015/08/13 20:27:43 tnn Exp $
-SHA1 (eagle-lin64-7.3.0.run) = dd7f9454a1170e886643228b4f353ddf529ca681
-RMD160 (eagle-lin64-7.3.0.run) = eee40fe5f913dddeda375484f94f57365c4084ca
-Size (eagle-lin64-7.3.0.run) = 48248700 bytes
+SHA1 (eagle-lin32-7.3.0.run) = ea92e705bfc3fbd7a89cc7125a88afeba9b5b881
+RMD160 (eagle-lin32-7.3.0.run) = 0f0d86d63fdf6419be075ee4ae11e18ac49734b9
+Size (eagle-lin32-7.3.0.run) = 48599533 bytes
diff --git a/cad/eagle/files/eagle b/cad/eagle/files/eagle
index 331d4d2b14e..028d4743137 100644
--- a/cad/eagle/files/eagle
+++ b/cad/eagle/files/eagle
@@ -1,5 +1,7 @@
#!/bin/sh
#
-# $NetBSD: eagle,v 1.1.1.1 2000/10/15 12:17:26 rh Exp $
+# $NetBSD: eagle,v 1.2 2015/08/13 20:27:43 tnn Exp $
#
-cd @@PREFIX@@/eagle && bin/eagle $*
+QT_XKB_CONFIG_ROOT="@@QT_XKB_CONFIG_ROOT@@"
+export QT_XKB_CONFIG_ROOT
+cd @@PREFIX@@/eagle && bin/eagle "$@"