diff options
| author | obache <obache@pkgsrc.org> | 2010-10-21 12:05:48 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-10-21 12:05:48 +0000 |
| commit | 400a1cc550148b571acfc346f866b9f3372162dd (patch) | |
| tree | 6cac3d4b8f754cecfff18f0c9c8bbf5938eebe27 /editors/emacs | |
| parent | 0fedfa592f7de1ad53186e1477613dd73dc1605e (diff) | |
| download | pkgsrc-400a1cc550148b571acfc346f866b9f3372162dd.tar.gz | |
Fixes build on NetBSD with X11_TYPE=native.
* honor PREFIX
* reorder rpath so that additional libraries will be prefered than builtin X.
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/Makefile | 7 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-bf | 18 |
3 files changed, 26 insertions, 2 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index adf18338640..4f267d08f3f 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.131 2010/09/14 11:13:11 wiz Exp $ +# $NetBSD: Makefile,v 1.132 2010/10/21 12:05:48 obache Exp $ PKGREVISION= 2 @@ -8,6 +8,11 @@ CONFLICTS+= emacs-nox11-[0-9]* .include "options.mk" +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= pre-configure +SUBST_VARS.prefix= PREFIX +SUBST_FILES.prefix= src/s/netbsd.h + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 97753007069..f9649fe9a9a 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2010/06/01 21:44:54 minskim Exp $ +$NetBSD: distinfo,v 1.47 2010/10/21 12:05:48 obache Exp $ SHA1 (emacs-23.2.tar.gz) = 2f99c7111c232cf04410607698d2db842e305c82 RMD160 (emacs-23.2.tar.gz) = 6d25f8d12cfa23e413ea353933ed871a3d3aa08e @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 +SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3 diff --git a/editors/emacs/patches/patch-bf b/editors/emacs/patches/patch-bf new file mode 100644 index 00000000000..6bf70d313fd --- /dev/null +++ b/editors/emacs/patches/patch-bf @@ -0,0 +1,18 @@ +$NetBSD: patch-bf,v 1.8 2010/10/21 12:05:49 obache Exp $ + +* honor PREFIX +* reorder rpath so that additional librares will be prefered than builtin X. + +--- src/s/netbsd.h.orig 2010-04-03 22:26:08.000000000 +0000 ++++ src/s/netbsd.h +@@ -75,8 +75,8 @@ along with GNU Emacs. If not, see <http + /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option + says where to find X windows at run time. We convert it to a -rpath option + which is what OSF1 uses. */ +-#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'` +-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib ++#define LD_SWITCH_SYSTEM_tmp -Wl,-rpath,@PREFIX@/lib -L@PREFIX@/lib ++#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'` + + /* The following is needed to make `configure' find Xpm, Xaw3d and + image include and library files if using /usr/bin/gcc. That |