Attachment #3481 for bug #9451

View | Details | Raw Unified | Return to bug 9451
Collapse All | Expand All





MAINTAINER=	junker@jazz.snu.ac.kr

BROKEN_ELF=	yes

WRKSRC=		${WRKDIR}/hanemacs-19.34
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
		--sharedstatedir=/var/run
STRIP=
MAN1=		emacs.1 etags.1 ctags.1


.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
.endfor
# install emacs.sh into ${PREFIX}/etc/rc.d
	${MKDIR} /var/run/emacs/lock
	chmod 1777 /var/run/emacs/lock
	@${MKDIR} ${PREFIX}/etc/rc.d
	@${INSTALL_SCRIPT} ${FILESDIR}/emacs.sh ${PREFIX}/etc/rc.d

.include <bsd.port.mk>

Line 0 Link Here

(-)./files/emacs.sh (+10 lines)
	1	#!/bin/sh
	2	if [ -d /var/run/emacs/lock ]
	3	then
	4	rm -f /var/run/emacs/lock/*
	5	else
	6	mkdir -p /var/run/emacs/lock
	7	fi
	8	chmod 1777 /var/run/emacs/lock
	9	exit 0
	10




--- orig/s/freebsd.h	Mon Jun 10 05:14:32 1996
+++ src/s/freebsd.h	Tue Sep 29 11:35:32 1998
@@ -1,5 +1,15 @@
 /* s/ file for freebsd system.  */
 
+/* Get the correct __FreeBSD_version, even if this is before that was
+   defined. */
+#ifndef __FreeBSD__
+#define __FreeBSD_version 199401
+#elif __FreeBSD__ == 1
+#define __FreeBSD_version 199405
+#define TERMINFO
+#define LIBS_TERMCAP -lncurses
+#else
+#include <osreldate.h>
+#endif
+
 /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
    Earlier versions do not have shared libraries, so inhibit them.
    You can inhibit them on newer systems if you wish
@@ -34,7 +44,6 @@
 #define LIBS_DEBUG
 #define LIBS_SYSTEM -lutil
 #define LIBS_TERMCAP -ltermcap
-#define LIB_GCC -lgcc
 
 #define SYSV_SYSTEM_DIR
 
@@ -42,12 +51,28 @@
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 
+#ifdef __ELF__
+
+#define LD_SWITCH_SYSTEM
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
+#define UNEXEC unexelf.o
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
+#undef LIB_GCC
+#define LIB_GCC
+
+#else /* not __ELF__ */
+
 #ifndef NO_SHARED_LIBS
 #define LD_SWITCH_SYSTEM -e start -dc -dp
 #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
+#if __FreeBSD_version >= 300002
+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
+#else /* __FreeBSD_version < 300002 */
 #define START_FILES pre-crt0.o /usr/lib/crt0.o
-#define UNEXEC unexsunos4.o
+#endif /* __FreeBSD_version < 300002 */
+#define UNEXEC unexfreebsd.o
 #define RUN_TIME_REMAP
+#define LIB_GCC -lgcc
 
 #ifndef N_TRELOFF
 #define N_PAGSIZ(x) __LDPGSZ
@@ -63,6 +88,8 @@
 #endif /* __FreeBSD__ */
 #endif /* NO_SHARED_LIBS */
 
+#endif /* not __ELF__ */
+
 #define HAVE_WAIT_HEADER
 #define HAVE_GETLOADAVG
 /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
@@ -80,6 +107,8 @@
 #define BSD 199103
 #elif __FreeBSD__ == 2
 #define BSD 199306




--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
@@ -678,7 +678,8 @@
   if (n < 0)
     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
 
-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
 
 #if 0 /* Maybe allow section after data2 - does this ever happen? */
@@ -845,7 +846,9 @@
 
       for (; symp < symendp; symp ++)
 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
-	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
     }

Lines 8-13 Link Here

(-)./pkg/PLIST (+3 lines)
8	bin/emacsclient	8	bin/emacsclient
9	@exec if [ ! -d %d/share/hanemacs/site-lisp ]; then mkdir -p %D/share/hanemacs/site-lisp; fi	9	@exec if [ ! -d %d/share/hanemacs/site-lisp ]; then mkdir -p %D/share/hanemacs/site-lisp; fi
10	@exec if [ ! -d %d/share/hanemacs/19.34/site-lisp ]; then mkdir -p %D/share/hanemacs/19.34/site-lisp; fi	10	@exec if [ ! -d %d/share/hanemacs/19.34/site-lisp ]; then mkdir -p %D/share/hanemacs/19.34/site-lisp; fi
		11	@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
		12	etc/rc.d/emacs.sh
11	@comment these two can fail if other ports are installed, no need to	13	@comment these two can fail if other ports are installed, no need to
12	@comment scare user in that case	14	@comment scare user in that case
13	@unexec %D/share/hanemacs/site-lisp 2>/dev/null \|\| true	15	@unexec %D/share/hanemacs/site-lisp 2>/dev/null \|\| true
Lines 134-139 Link Here
134	share/hanemacs/19.34/etc/DEBUG	136	share/hanemacs/19.34/etc/DEBUG
135	share/hanemacs/19.34/etc/DISTRIB	137	share/hanemacs/19.34/etc/DISTRIB
136	share/hanemacs/19.34/etc/DOC-19.34.1	138	share/hanemacs/19.34/etc/DOC-19.34.1
		139	share/hanemacs/19.34/etc/DOC-19.34.2
137	share/hanemacs/19.34/etc/FAQ	140	share/hanemacs/19.34/etc/FAQ
138	share/hanemacs/19.34/etc/FTP	141	share/hanemacs/19.34/etc/FTP
139	share/hanemacs/19.34/etc/GNU	142	share/hanemacs/19.34/etc/GNU

Return to bug 9451

Lines 14-25 Link Here

(-)./Makefile (-3 / +7 lines)
14		14
15	MAINTAINER= junker@jazz.snu.ac.kr	15	MAINTAINER= junker@jazz.snu.ac.kr
16		16
17	BROKEN_ELF= yes
18
19	WRKSRC= ${WRKDIR}/hanemacs-19.34	17	WRKSRC= ${WRKDIR}/hanemacs-19.34
20	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
21	USE_GMAKE= yes	19	USE_GMAKE= yes
22	CONFIGURE_ARGS= i386--freebsd --with-x-toolkit --prefix=${PREFIX}	20	CONFIGURE_ARGS= i386--freebsd --with-x-toolkit \
		21	--sharedstatedir=/var/run
23	STRIP=	22	STRIP=
24	MAN1= emacs.1 etags.1 ctags.1	23	MAN1= emacs.1 etags.1 ctags.1
25		24
Lines 42-46 Link Here
42	.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message	41	.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
43	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir	42	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
44	.endfor	43	.endfor
		44	# install emacs.sh into ${PREFIX}/etc/rc.d
		45	${MKDIR} /var/run/emacs/lock
		46	chmod 1777 /var/run/emacs/lock
		47	@${MKDIR} ${PREFIX}/etc/rc.d
		48	@${INSTALL_SCRIPT} ${FILESDIR}/emacs.sh ${PREFIX}/etc/rc.d
45		49
46	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-33 Link Here

(-)./patches/patch-ac (-16 / +52 lines)
1	--- src/s/freebsd.h.orig Sun Jun 9 13:14:32 1996	1	--- orig/s/freebsd.h Mon Jun 10 05:14:32 1996
2	+++ src/s/freebsd.h Wed Dec 3 17:36:40 1997	2	+++ src/s/freebsd.h Tue Sep 29 11:35:32 1998
3	@@ -33,9 +33,16 @@	3	@@ -1,5 +1,15 @@
		4	/* s/ file for freebsd system. */
4		5
5	#define LIBS_DEBUG	6	+/* Get the correct __FreeBSD_version, even if this is before that was
6	#define LIBS_SYSTEM -lutil	7	+ defined. */
7	-#define LIBS_TERMCAP -ltermcap	8	+#ifndef __FreeBSD__
8	#define LIB_GCC -lgcc	9	+#define __FreeBSD_version 199401
9		10	+#elif __FreeBSD__ == 1
10	+#ifdef HAVE_LIBNCURSES	11	+#define __FreeBSD_version 199405
11	+#define TERMINFO
12	+#define LIBS_TERMCAP -lncurses
13	+#else	12	+#else
14	+#define LIBS_TERMCAP -ltermcap	13	+#include <osreldate.h>
15	+#endif	14	+#endif
16	+	15	+
17	+	16	/* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
		17	Earlier versions do not have shared libraries, so inhibit them.
		18	You can inhibit them on newer systems if you wish
		19	@@ -34,7 +44,6 @@
		20	#define LIBS_DEBUG
		21	#define LIBS_SYSTEM -lutil
		22	#define LIBS_TERMCAP -ltermcap
		23	-#define LIB_GCC -lgcc
		24
18	#define SYSV_SYSTEM_DIR	25	#define SYSV_SYSTEM_DIR
19		26
20	/* freebsd has POSIX-style pgrp behavior. */	27	@@ -42,12 +51,28 @@
21	@@ -46,7 +53,7 @@	28	#undef BSD_PGRPS
		29	#define GETPGRP_NO_ARG
		30
		31	+#ifdef __ELF__
		32	+
		33	+#define LD_SWITCH_SYSTEM
		34	+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
		35	+#define UNEXEC unexelf.o
		36	+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
		37	+#undef LIB_GCC
		38	+#define LIB_GCC
		39	+
		40	+#else /* not __ELF__ */
		41	+
		42	#ifndef NO_SHARED_LIBS
22	#define LD_SWITCH_SYSTEM -e start -dc -dp	43	#define LD_SWITCH_SYSTEM -e start -dc -dp
23	#define HAVE_TEXT_START /* No need to define `start_of_text'. */	44	#define HAVE_TEXT_START /* No need to define `start_of_text'. */
		45	+#if __FreeBSD_version >= 300002
		46	+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
		47	+#else /* __FreeBSD_version < 300002 */
24	#define START_FILES pre-crt0.o /usr/lib/crt0.o	48	#define START_FILES pre-crt0.o /usr/lib/crt0.o
25	-#define UNEXEC unexsunos4.o	49	-#define UNEXEC unexsunos4.o
		50	+#endif /* __FreeBSD_version < 300002 */
26	+#define UNEXEC unexfreebsd.o	51	+#define UNEXEC unexfreebsd.o
27	#define RUN_TIME_REMAP	52	#define RUN_TIME_REMAP
		53	+#define LIB_GCC -lgcc
28		54
29	#ifndef N_TRELOFF	55	#ifndef N_TRELOFF
30	@@ -80,6 +87,8 @@	56	#define N_PAGSIZ(x) __LDPGSZ
		57	@@ -63,6 +88,8 @@
		58	#endif /* __FreeBSD__ */
		59	#endif /* NO_SHARED_LIBS */
		60
		61	+#endif /* not __ELF__ */
		62	+
		63	#define HAVE_WAIT_HEADER
		64	#define HAVE_GETLOADAVG
		65	/#define HAVE_GETPAGESIZE / configure now puts this in config.h */
		66	@@ -80,6 +107,8 @@
31	#define BSD 199103	67	#define BSD 199103
32	#elif __FreeBSD__ == 2	68	#elif __FreeBSD__ == 2
33	#define BSD 199306	69	#define BSD 199306

Line 0 Link Here

(-)./patches/patch-af (+22 lines)
	1	--- src/unexelf.c.orig Fri Oct 2 12:55:43 1998
	2	+++ src/unexelf.c Fri Oct 2 13:02:05 1998
	3	@@ -678,7 +678,8 @@
	4	if (n < 0)
	5	fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
	6
	7	- NEW_PROGRAM_H (n).p_filesz += new_data2_size;
	8	+/* NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
	9	+ NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
	10	NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
	11
	12	#if 0 /* Maybe allow section after data2 - does this ever happen? */
	13	@@ -845,7 +846,9 @@
	14
	15	for (; symp < symendp; symp ++)
	16	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
	17	- \|\| strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
	18	+ \|\| strcmp ((char *) (symnames + symp->st_name), "end") == 0
	19	+ \|\| strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
	20	+ \|\| strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
	21	memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
	22	}