head	1.9;
access;
symbols
	pkgsrc-2013Q2:1.9.0.2
	pkgsrc-2013Q2-base:1.9
	pkgsrc-2012Q4:1.8.0.20
	pkgsrc-2012Q4-base:1.8
	pkgsrc-2012Q3:1.8.0.18
	pkgsrc-2012Q3-base:1.8
	pkgsrc-2012Q2:1.8.0.16
	pkgsrc-2012Q2-base:1.8
	pkgsrc-2012Q1:1.8.0.14
	pkgsrc-2012Q1-base:1.8
	pkgsrc-2011Q4:1.8.0.12
	pkgsrc-2011Q4-base:1.8
	pkgsrc-2011Q3:1.8.0.10
	pkgsrc-2011Q3-base:1.8
	pkgsrc-2011Q2:1.8.0.8
	pkgsrc-2011Q2-base:1.8
	pkgsrc-2011Q1:1.8.0.6
	pkgsrc-2011Q1-base:1.8
	pkgsrc-2010Q4:1.8.0.4
	pkgsrc-2010Q4-base:1.8
	pkgsrc-2010Q3:1.8.0.2
	pkgsrc-2009Q4:1.7.0.46
	pkgsrc-2009Q4-base:1.7
	pkgsrc-2008Q4:1.7.0.44
	pkgsrc-2008Q4-base:1.7
	pkgsrc-2008Q3:1.7.0.42
	pkgsrc-2008Q3-base:1.7
	cube-native-xorg:1.7.0.40
	cube-native-xorg-base:1.7
	pkgsrc-2008Q2:1.7.0.38
	pkgsrc-2008Q2-base:1.7
	pkgsrc-2008Q1:1.7.0.36
	pkgsrc-2008Q1-base:1.7
	pkgsrc-2007Q4:1.7.0.34
	pkgsrc-2007Q4-base:1.7
	pkgsrc-2007Q3:1.7.0.32
	pkgsrc-2007Q3-base:1.7
	pkgsrc-2007Q2:1.7.0.30
	pkgsrc-2007Q2-base:1.7
	pkgsrc-2007Q1:1.7.0.28
	pkgsrc-2007Q1-base:1.7
	pkgsrc-2006Q4:1.7.0.26
	pkgsrc-2006Q4-base:1.7
	pkgsrc-2006Q3:1.7.0.24
	pkgsrc-2006Q3-base:1.7
	pkgsrc-2006Q2:1.7.0.22
	pkgsrc-2006Q2-base:1.7
	pkgsrc-2006Q1:1.7.0.20
	pkgsrc-2006Q1-base:1.7
	pkgsrc-2005Q4:1.7.0.18
	pkgsrc-2005Q4-base:1.7
	pkgsrc-2005Q3:1.7.0.16
	pkgsrc-2005Q3-base:1.7
	pkgsrc-2005Q2:1.7.0.14
	pkgsrc-2005Q2-base:1.7
	pkgsrc-2005Q1:1.7.0.12
	pkgsrc-2005Q1-base:1.7
	pkgsrc-2004Q4:1.7.0.10
	pkgsrc-2004Q4-base:1.7
	pkgsrc-2004Q3:1.7.0.8
	pkgsrc-2004Q3-base:1.7
	pkgsrc-2004Q2:1.7.0.6
	pkgsrc-2004Q2-base:1.7
	pkgsrc-2004Q1:1.7.0.4
	pkgsrc-2004Q1-base:1.7
	pkgsrc-2003Q4:1.7.0.2
	pkgsrc-2003Q4-base:1.7
	netbsd-1-6-1:1.6.0.6
	netbsd-1-6-1-base:1.6
	netbsd-1-6:1.6.0.8
	netbsd-1-6-RELEASE-base:1.6
	pkgviews:1.6.0.4
	pkgviews-base:1.6
	buildlink2:1.6.0.2
	buildlink2-base:1.6
	netbsd-1-5-PATCH003:1.6
	netbsd-1-5-PATCH001:1.6
	netbsd-1-5-RELEASE:1.5
	netbsd-1-4-PATCH003:1.5
	netbsd-1-4-PATCH002:1.5
	comdex-fall-1999:1.2
	netbsd-1-4-PATCH001:1.2;
locks; strict;
comment	@# @;


1.9
date	2013.02.17.05.00.48;	author dholland;	state dead;
branches;
next	1.8;

1.8
date	2010.10.21.12.05.49;	author obache;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2003.04.11.00.50.57;	author uebayasi;	state dead;
branches;
next	1.6;

1.6
date	2000.11.29.13.45.11;	author minoura;	state Exp;
branches;
next	1.5;

1.5
date	2000.01.22.19.57.47;	author tron;	state Exp;
branches;
next	1.4;

1.4
date	99.12.28.14.09.17;	author tron;	state Exp;
branches;
next	1.3;

1.3
date	99.12.28.05.35.05;	author wiz;	state Exp;
branches;
next	1.2;

1.2
date	99.06.13.00.22.53;	author cgd;	state Exp;
branches;
next	1.1;

1.1
date	99.06.04.17.52.37;	author thorpej;	state Exp;
branches;
next	;

1.8.2.1
date	2010.10.21.12.05.49;	author tron;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2010.10.22.10.38.15;	author tron;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Move editors/emacs to editors/emacs23.
@
text
@$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
@


1.8
log
@Fixes build on NetBSD with X11_TYPE=native.
* honor PREFIX
* reorder rpath so that additional libraries will be prefered than builtin X.
@
text
@d1 1
a1 1
$NetBSD$
@


1.8.2.1
log
@file patch-bf was added on branch pkgsrc-2010Q3 on 2010-10-22 10:38:15 +0000
@
text
@d1 18
@


1.8.2.2
log
@Pullup ticket #3250 - requested by obache
editors/emacs: build fix

Revisions pulled up:
- editors/emacs/Makefile			1.132
- editors/emacs/distinfo			1.47
- editors/emacs/patches/patch-bf		1.8
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Thu Oct 21 12:05:49 UTC 2010

Modified Files:
	pkgsrc/editors/emacs: Makefile distinfo
Added Files:
	pkgsrc/editors/emacs/patches: patch-bf

Log Message:
Fixes build on NetBSD with X11_TYPE=native.
* honor PREFIX
* reorder rpath so that additional libraries will be prefered than builtin X.
@
text
@a0 18
$NetBSD$

* 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
@


1.7
log
@Remove old patches
@
text
@d1 1
a1 1
$NetBSD: patch-bf,v 1.6 2000/11/29 13:45:11 minoura Exp $
d3 6
a8 16
--- src/s/netbsd.h.orig	Sat Apr 11 20:15:19 1998
+++ src/s/netbsd.h	Sat Jan 22 20:22:29 2000
@@@@ -57,7 +57,7 @@@@
 #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
 #define N_TRELOFF(x) N_RELOFF(x)
 #endif
-#endif /* not NO_SHARED_LIBS */
+#endif /* not NO_SHARED_LIBS and not ELF */
 
 #define HAVE_WAIT_HEADER
 #define WAIT_USE_INT
@@@@ -66,11 +66,15 @@@@
 
 #define AMPERSAND_FULL_NAME
 
-#ifdef __ELF__
d12 4
a15 7
 #define LD_SWITCH_SYSTEM `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
+
+#ifdef __ELF__
+#define HAVE_TEXT_START		/* No need to define `start_of_text'.  */
+#define UNEXEC unexelf.o
+#define ORDINARY_LINK
 #endif /* __ELF__ */
d17 2
a18 1
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
@


1.6
log
@s/unexelf.c/unexelf.o/
This caused a circular dependency.
Pointed out by Satoshi Yatagawa <yatagawa@@cc.teu.ac.jp>.
@
text
@d1 1
a1 1
$NetBSD: patch-bf,v 1.5 2000/01/22 19:57:47 tron Exp $
@


1.5
log
@Use run time library path on a.out systems, too.
@
text
@d1 1
a1 1
$NetBSD$
d26 1
a26 1
+#define UNEXEC unexelf.c
@


1.4
log
@Update "emacs" package to version 20.5a based on patches supplied by
Minoura Makoto in PR pkg/9014. This version fixes several bugs discovered
since version 20.3 and support a precompiled user startup file (".emacs.el"
and ".emacs.elc").
@
text
@d3 2
a4 2
--- src/s/netbsd.h.orig	Sat Apr 11 11:15:19 1998
+++ src/s/netbsd.h	Fri Jun  4 09:41:33 1999
d14 6
a19 1
@@@@ -71,6 +71,10 @@@@
d24 1
@


1.3
log
@RCS tag added
@
text
@d2 1
@


1.2
log
@When doing ELF, use ORDINARY_LINK instead of START_FILES+LIB_STANDARD.
This works on e.g. NetBSD/i386 (and probably other new-to-ELF ports),
as well as NetBSD/alpha.  It also looks like it'll work on powerpc, though
mips may have problems.  If possible, this is probably the 'right' way
to do this.
@
text
@d1 1
@


1.1
log
@I don't pretend to understand the ELF crap either, but this makes Emacs
build/work on i386 ELF (and probably SPARC ELF, too).
@
text
@d12 1
a12 1
@@@@ -71,6 +71,11 @@@@
d19 1
a19 2
+#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
@