Attachment #50767 for bug #77291

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

Lines 132-138 Link Here

(-)Mk/bsd.emacs.mk (-1 / +1 lines)
132	# XEmacs-21.x	132	# XEmacs-21.x
133	.elif (${EMACS_PORT_NAME} == "xemacs21")	133	.elif (${EMACS_PORT_NAME} == "xemacs21")
134	EMACS_NAME= xemacs	134	EMACS_NAME= xemacs
135	EMACS_VER= 21.4.16	135	EMACS_VER= 21.4.17
136	EMACS_MAJOR_VER= 21	136	EMACS_MAJOR_VER= 21
137	EMACS_LIBDIR?= lib/${EMACS_NAME}	137	EMACS_LIBDIR?= lib/${EMACS_NAME}
138	EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER}	138	EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER}




MAINTAINER?=	ports@FreeBSD.org
COMMENT?=	This port tracks the stable version of the XEmacs text editor

XEMACS_REL=	21.4
XEMACS_VER=	21.4.17
XEMACS_ARCH=	${CONFIGURE_TARGET}

NOT_FOR_ARCHS=	sparc64

RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
.if !defined(WITHOUT_X11)
LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
		png.5:${PORTSDIR}/graphics/png \
		tiff.4:${PORTSDIR}/graphics/tiff \
		compface.1:${PORTSDIR}/mail/faces
USE_XLIB=	yes
USE_XPM=	yes
.endif
USE_BZIP2=	yes

XEMACS_REL=	21.4
XEMACS_VER=	21.4.16
XEMACS_ARCH=	${CONFIGURE_TARGET}

USE_BZIP2=	yes
STRIP=
USE_AUTOCONF_VER=213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd

		--with-ldap=no \
		--with-site-lisp \
		--with-database=berkdb \
		${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \
		${WITH_XFACE} ${WITH_OFFIX}
MAKE_ARGS=	prefix=${PREFIX}
MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
		gnuserv.1 xemacs.1


# Undump and malloc do not behave on amd64 at the moment
.if ${ARCH} == amd64
CONFIGURE_ARGS+=	--with-system-malloc --pdump
.endif

.if !defined(WITHOUT_X11)
LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
		jpeg.9:${PORTSDIR}/graphics/jpeg \
		tiff.4:${PORTSDIR}/graphics/tiff \
		compface.1:${PORTSDIR}/mail/faces
CONFIGURE_ARGS+=	--with-png --with-jpeg --with-tiff
USE_XLIB=	yes
USE_XPM=	yes
.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
USE_MOTIF=	yes
WITH_SCROLLBARS=	--with-scrollbars=motif
WITH_DIALOGS=	--with-dialogs=motif
WITH_WIDGETS=	--with-widgets=motif
.else
WITH_SCROLLBARS=	--with-scrollbars=athena
WITH_DIALOGS=	--with-dialogs=athena
WITH_WIDGETS=	--with-widgets=athena
.if defined(WITH_XAW3D)
LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+=	--with-athena=3d
	@${ECHO_MSG} ""
	@${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally"
	@${ECHO_MSG} "experience locked-up frames."
	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
.endif
.if !defined(WITHOUT_X11)
	@${ECHO_MSG} ""
	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
	@${ECHO_MSG} "do not want to use X11."
CONFIG_ARGS+=	--with-png=yes --with-tiff=yes
.endif
.else
CONFIGURE_ARGS+=	--without-x11
.endif

pre-patch:
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
	@${ECHO_MSG} ""
	@${ECHO_MSG} "If your MOTIF library is lesstif you might occasionally"
	@${ECHO_MSG} "experience locked-up frames."
	@${ECHO_MSG} "In this case, set the environment variable WITHOUT_MOTIF"
	@${ECHO_MSG} "and recompile, which will force the use of athena for"
	@${ECHO_MSG} "scrollbars, dialogs and widgets."
.endif
	@${ECHO_MSG} ""
	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you do not"
	@${ECHO_MSG} "want to use X11."
.endif

#.if defined(WANT_GTK)
#USE_GNOME=	gtk20
#MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
#WITH_GTK=	--with-gtk=yes \
#		--with-xpm=no
#USE_XPM=	no
#.endif

# Drop faces (libcompface) and offix (libDnd) if building package,
# autodetect otherwise
.if defined(PACKAGE_BUILDING)
WITH_XFACE?=	--with-xface=no
WITH_OFFIX?=	--with-offix=no
.endif
.endif

post-patch:
	@${RM} ${WRKSRC}/src/s/freebsd.h.orig

# fix .so references in a few man pages
pre-configure::
.for f in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${f} > ${WRKDIR}/tmp_zot
	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${f}
.endfor

post-install::
.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
	${STRIP_CMD} ${PREFIX}/bin/${f}
.endfor
# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
# Do what PLIST does for pkg_add.
	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
	${RM} -f ${PREFIX}/bin/send-pr
#.if defined(WANT_GTK)
#	@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
#	@${ECHO_MSG} "the maintainer."
#	@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
#	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
#.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)editors/xemacs/distinfo (-2 / +2 lines)
1	MD5 (xemacs/xemacs-21.4.16.tar.bz2) = a3a5000db3ada076a117665ea473dab4	1	MD5 (xemacs/xemacs-21.4.17.tar.bz2) = a207e106138c085711160855d78b72a2
2	SIZE (xemacs/xemacs-21.4.16.tar.bz2) = 9029850	2	SIZE (xemacs/xemacs-21.4.17.tar.bz2) = 8693211




--- lib-src/fakemail.c.orig	Tue Mar 23 22:09:58 1999
+++ lib-src/fakemail.c	Tue Mar 23 22:12:20 1999
@@ -157,9 +157,17 @@
 extern char *malloc (), *realloc ();
 #endif
 
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
+#define CURRENT_USER
+#endif
+
 #ifdef CURRENT_USER
 extern struct passwd *getpwuid ();
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
+extern uid_t geteuid ();
+#else
 extern unsigned short geteuid ();
+#endif
 static struct passwd *my_entry;
 #define cuserid(s)				\
 (my_entry = getpwuid (((int) geteuid ())),	\




--- ./src/unexelf.c~    Sun Aug 15 03:29:56 1999
+++ ./src/unexelf.c     Tue Nov  2 10:24:55 1999
@@ -515,6 +515,14 @@
 # include <sys/exec_elf.h>
 #endif
 
+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
+# ifdef __STDC__
+#  define ElfW(type)   Elf64_##type
+# else
+#  define ElfW(type)   Elf64_/**/type
+# endif
+#endif
+
 #if __GNU_LIBRARY__ - 0 >= 6
 # include <link.h>     /* get ElfW etc */
 #endif

Lines 1-11 Link Here

(-)editors/xemacs/files/patch-freebsd.h (-11 lines)
1	--- src/s/freebsd.h.orig Sun Nov 21 16:14:32 2004
2	+++ src/s/freebsd.h Sun Nov 21 16:15:10 2004
3	@@ -29,7 +29,7 @@
4	#ifndef __FreeBSD_version
5	#include <osreldate.h>
6	#endif
7	-#if __FreeBSD_version >= 199701
8	+#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006
9	#define LIBS_SYSTEM "-lutil -lxpg4"
10	#else
11	#define LIBS_SYSTEM "-lutil"

Return to bug 77291

Lines 16-38 Link Here

(-)editors/xemacs/Makefile (-66 / +45 lines)
16	MAINTAINER?= ports@FreeBSD.org	16	MAINTAINER?= ports@FreeBSD.org
17	COMMENT?= This port tracks the stable version of the XEmacs text editor	17	COMMENT?= This port tracks the stable version of the XEmacs text editor
18		18
		19	XEMACS_REL= 21.4
		20	XEMACS_VER= 21.4.17
		21	XEMACS_ARCH= ${CONFIGURE_TARGET}
		22
19	NOT_FOR_ARCHS= sparc64	23	NOT_FOR_ARCHS= sparc64
20		24
21	RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages	25	RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
22	.if !defined(WITHOUT_X11)
23	LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
24	png.5:${PORTSDIR}/graphics/png \
25	tiff.4:${PORTSDIR}/graphics/tiff \
26	compface.1:${PORTSDIR}/mail/faces
27	USE_XLIB= yes
28	USE_XPM= yes
29	.endif
30	USE_BZIP2= yes
31
32	XEMACS_REL= 21.4
33	XEMACS_VER= 21.4.16
34	XEMACS_ARCH= ${CONFIGURE_TARGET}
35		26
		27	USE_BZIP2= yes
36	STRIP=	28	STRIP=
37	USE_AUTOCONF_VER=213	29	USE_AUTOCONF_VER=213
38	CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd	30	CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
Lines 44-50 Link Here
44	--with-ldap=no \	36	--with-ldap=no \
45	--with-site-lisp \	37	--with-site-lisp \
46	--with-database=berkdb \	38	--with-database=berkdb \
47	${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} ${WITH_GTK}	39	${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \
		40	${WITH_XFACE} ${WITH_OFFIX}
48	MAKE_ARGS= prefix=${PREFIX}	41	MAKE_ARGS= prefix=${PREFIX}
49	MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \	42	MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
50	gnuserv.1 xemacs.1	43	gnuserv.1 xemacs.1
Lines 56-141 Link Here
56		49
57	# Undump and malloc do not behave on amd64 at the moment	50	# Undump and malloc do not behave on amd64 at the moment
58	.if ${ARCH} == amd64	51	.if ${ARCH} == amd64
59	CONFIGURE_ARGS+=--with-system-malloc --pdump	52	CONFIGURE_ARGS+= --with-system-malloc --pdump
60	.endif	53	.endif
61		54
62	.if exists(${X11BASE}/lib/libXm.so)	55	.if !defined(WITHOUT_X11)
		56	LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
		57	jpeg.9:${PORTSDIR}/graphics/jpeg \
		58	tiff.4:${PORTSDIR}/graphics/tiff \
		59	compface.1:${PORTSDIR}/mail/faces
		60	CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff
		61	USE_XLIB= yes
		62	USE_XPM= yes
		63	.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
63	USE_MOTIF= yes	64	USE_MOTIF= yes
64	HAVE_MOTIF= yes	65	WITH_SCROLLBARS= --with-scrollbars=motif
65	.endif	66	WITH_DIALOGS= --with-dialogs=motif
66		67	WITH_WIDGETS= --with-widgets=motif
67	pre-fetch:	68	.else
68	#.if !defined(WANT_GTK)	69	WITH_SCROLLBARS= --with-scrollbars=athena
69	# @${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "	70	WITH_DIALOGS= --with-dialogs=athena
70	# @${ECHO_MSG} "and recompile."	71	WITH_WIDGETS= --with-widgets=athena
71	#.endif	72	.if defined(WITH_XAW3D)
72	.if defined(HAVE_MOTIF)	73	LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
73	.if !defined(MOTIF_STATIC)	74	CONFIGURE_ARGS+= --with-athena=3d
74	@${ECHO_MSG} ""
75	@${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally"
76	@${ECHO_MSG} "experience locked-up frames."
77	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
78	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
79	.endif	75	.endif
80	.if !defined(WITHOUT_X11)
81	@${ECHO_MSG} ""
82	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
83	@${ECHO_MSG} "do not want to use X11."
84	CONFIG_ARGS+= --with-png=yes --with-tiff=yes
85	.endif	76	.endif
86	.if defined(WITHOUT_X11)	77	.else
87	CONFIGURE_ARGS+= --without-x11	78	CONFIGURE_ARGS+= --without-x11
88	.endif	79	.endif
89		80
90	# hack to avoid shipping binaries linked with Motif	81	pre-patch:
91	.if defined(MOTIF_STATIC)	82	.if !defined(WITHOUT_X11)
92	WITH_DIALOGS= --with-dialogs=athena	83	.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
		84	@${ECHO_MSG} ""
		85	@${ECHO_MSG} "If your MOTIF library is lesstif you might occasionally"
		86	@${ECHO_MSG} "experience locked-up frames."
		87	@${ECHO_MSG} "In this case, set the environment variable WITHOUT_MOTIF"
		88	@${ECHO_MSG} "and recompile, which will force the use of athena for"
		89	@${ECHO_MSG} "scrollbars, dialogs and widgets."
93	.endif	90	.endif
94		91	@${ECHO_MSG} ""
95	.if defined(WITH_XAW3D)	92	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you do not"
96	LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d	93	@${ECHO_MSG} "want to use X11."
97	.endif	94	.endif
98		95
99	#.if defined(WANT_GTK)
100	#USE_GNOME= gtk20
101	#MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
102	#WITH_GTK= --with-gtk=yes \
103	# --with-xpm=no
104	#USE_XPM= no
105	#.endif
106
107	# Drop faces (libcompface) and offix (libDnd) if building package,	96	# Drop faces (libcompface) and offix (libDnd) if building package,
108	# autodetect otherwise	97	# autodetect otherwise
109	.if defined(PACKAGE_BUILDING)	98	.if defined(PACKAGE_BUILDING)
110	WITH_XFACE?= --with-xface=no	99	WITH_XFACE?= --with-xface=no
111	WITH_OFFIX?= --with-offix=no	100	WITH_OFFIX?= --with-offix=no
112	.endif	101	.endif
113	.endif
114
115	post-patch:
116	@${RM} ${WRKSRC}/src/s/freebsd.h.orig
117		102
118	# fix .so references in a few man pages	103	# fix .so references in a few man pages
119	pre-configure::	104	pre-configure::
120	.for file in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1	105	.for f in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
121	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${file} > ${WRKDIR}/tmp_zot	106	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${f} > ${WRKDIR}/tmp_zot
122	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${file}	107	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${f}
123	.endfor	108	.endfor
124		109
125	post-install::	110	post-install::
126	.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}	111	.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
127	${STRIP_CMD} ${PREFIX}/bin/${file}	112	${STRIP_CMD} ${PREFIX}/bin/${f}
128	.endfor	113	.endfor
129	# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.	114	# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
130	# Do what PLIST does for pkg_add.	115	# Do what PLIST does for pkg_add.
131	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp	116	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
132	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp	117	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
133	${RM} -f ${PREFIX}/bin/send-pr	118	${RM} -f ${PREFIX}/bin/send-pr
134	#.if defined(WANT_GTK)
135	# @${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
136	# @${ECHO_MSG} "the maintainer."
137	# @${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
138	# @${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
139	#.endif
140		119
141	.include <bsd.port.post.mk>	120	.include <bsd.port.post.mk>

Lines 1-20 Link Here

(-)editors/xemacs/files/patch-ai (-20 lines)
1	--- lib-src/fakemail.c.orig Tue Mar 23 22:09:58 1999
2	+++ lib-src/fakemail.c Tue Mar 23 22:12:20 1999
3	@@ -157,9 +157,17 @@
4	extern char malloc (), realloc ();
5	#endif
6
7	+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
8	+#define CURRENT_USER
9	+#endif
10	+
11	#ifdef CURRENT_USER
12	extern struct passwd *getpwuid ();
13	+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
14	+extern uid_t geteuid ();
15	+#else
16	extern unsigned short geteuid ();
17	+#endif
18	static struct passwd *my_entry;
19	#define cuserid(s) \
20	(my_entry = getpwuid (((int) geteuid ())), \

Lines 1-17 Link Here

(-)editors/xemacs/files/patch-ak (-17 lines)
1	--- ./src/unexelf.c~ Sun Aug 15 03:29:56 1999
2	+++ ./src/unexelf.c Tue Nov 2 10:24:55 1999
3	@@ -515,6 +515,14 @@
4	# include <sys/exec_elf.h>
5	#endif
6
7	+#if defined(__FreeBSD__) && (defined(__alpha__) \|\| defined(__amd64__))
8	+# ifdef __STDC__
9	+# define ElfW(type) Elf64_##type
10	+# else
11	+# define ElfW(type) Elf64_/**/type
12	+# endif
13	+#endif
14	+
15	#if __GNU_LIBRARY__ - 0 >= 6
16	# include <link.h> /* get ElfW etc */
17	#endif