View | Details | Raw Unified | Return to bug 78960 | Differences between
and this patch

Collapse All | Expand All

(-)editors/xemac-devel-mule/Makefile (-23 / +28 lines)
Lines 44-70 Link Here
44
.endif
44
.endif
45
45
46
XEMACS_REL=	21.5
46
XEMACS_REL=	21.5
47
XEMACS_VER=	${XEMACS_REL}-b19
47
XEMACS_VER=	${XEMACS_REL}-b20
48
XEMACS_ARCH=	${CONFIGURE_TARGET}
48
XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
49
49
50
WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
50
WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
51
STRIP=
51
STRIP=
52
USE_AUTOCONF_VER=213
52
USE_AUTOCONF_VER=259
53
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
53
CONFIGURE_TARGET=--build=${XEMACS_ARCH}
54
54
55
CONFIGURE_ARGS=	--with-mule \
55
CONFIGURE_ARGS=	--enable-mule \
56
		--x-includes=${X11BASE}/include \
56
		--x-includes=${X11BASE}/include \
57
		--x-libraries=${X11BASE}/lib \
57
		--x-libraries=${X11BASE}/lib \
58
		--site-libraries='${SITE_LIBRARIES}' \
58
		--with-site-libraries='${SITE_LIBRARIES}' \
59
		--site-includes='${SITE_INCLUDES}' \
59
		--with-site-includes='${SITE_INCLUDES}' \
60
		--with-sound=native \
60
		--enable-sound=native \
61
		--with-site-lisp \
61
		--with-site-lisp \
62
		--with-pop \
62
		--with-pop \
63
		--with-xfs \
63
		--with-xfs \
64
		--with-ldap=no \
64
		--with-ldap=no \
65
		--infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
65
		--with-infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
66
		--with-clash-detection \
66
		--enable-clash-detection \
67
		--with-database=berkdb \
67
		--enable-database=berkdb \
68
		${WITH_XIM} \
68
		${WITH_XIM} \
69
		${WITH_MENUBARS} ${WITH_SCROLLBARS} \
69
		${WITH_MENUBARS} ${WITH_SCROLLBARS} \
70
		${WITH_DIALOGS} ${WITH_WIDGETS}
70
		${WITH_DIALOGS} ${WITH_WIDGETS}
Lines 82-92 Link Here
82
.endif
82
.endif
83
83
84
.if !defined(DEBUG)
84
.if !defined(DEBUG)
85
CONFIGURE_ARGS+=--debug=no --error-checking=none
85
CONFIGURE_ARGS+=--enable-debug=no --enable-error-checking=no
86
.endif
86
.endif
87
87
88
.if defined(WITH_GTK)
88
.if defined(WITH_GTK)
89
CONFIGURE_ARGS+=--with-gtk
89
CONFIGURE_ARGS+=--with-gtk
90
WITH_XIM=
91
WITH_MENUBARS=	--enable-menubars=gtk
92
WITH_SCROLLBARS=--enable-scrollbars=gtk
93
WITH_DIALOGS=	--enable-dialogs=gtk
94
WITH_WIDGETS=	--enable-widgets=gtk
90
USE_GNOME+=	gtk12
95
USE_GNOME+=	gtk12
91
.endif
96
.endif
92
97
Lines 98-104 Link Here
98
103
99
# Undump and malloc do not behave on amd64 and sparc64
104
# Undump and malloc do not behave on amd64 and sparc64
100
.if (${ARCH} == "amd64") || (${ARCH} == "sparc64")
105
.if (${ARCH} == "amd64") || (${ARCH} == "sparc64")
101
CONFIGURE_ARGS+=--with-system-malloc --pdump
106
CONFIGURE_ARGS+=--with-system-malloc --enable-pdump
102
.endif
107
.endif
103
108
104
pre-fetch:
109
pre-fetch:
Lines 106-112 Link Here
106
	@${ECHO_MSG} ""
111
	@${ECHO_MSG} ""
107
	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
112
	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
108
	@${ECHO_MSG} "do not want to use X11."
113
	@${ECHO_MSG} "do not want to use X11."
109
CONFIGURE_ARGS+=	--without-x11
114
CONFIGURE_ARGS+=	--with-x11=no
110
.else
115
.else
111
.if !defined(WITH_GTK)
116
.if !defined(WITH_GTK)
112
	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WITH_GTK and recompile."
117
	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WITH_GTK and recompile."
Lines 124-146 Link Here
124
129
125
# hack to avoid shipping binaries linked with Motif
130
# hack to avoid shipping binaries linked with Motif
126
.if defined(MOTIF_STATIC)
131
.if defined(MOTIF_STATIC)
127
WITH_DIALOGS=	--with-dialogs=athena
132
WITH_DIALOGS?=	--enable-dialogs=athena
128
.else
133
.else
129
WITH_DIALOGS=	--with-dialogs=motif
134
WITH_DIALOGS?=	--enable-dialogs=motif
130
.endif
135
.endif
131
136
132
.if defined(PACKAGE_BUILDING)
137
.if defined(PACKAGE_BUILDING)
133
CONFIGURE_ARGS+=--with-offix=no
138
CONFIGURE_ARGS+=--with-offix=no
134
.endif
139
.endif
135
WITH_MENUBARS?=	--with-menubars=lucid
140
WITH_MENUBARS?=	--enable-menubars=lucid
136
WITH_SCROLLBARS?=--with-scrollbars=motif
141
WITH_SCROLLBARS?=--enable-scrollbars=motif
137
WITH_WIDGETS?=	--with-widgets=motif
142
WITH_WIDGETS?=	--enable-widgets=motif
138
.endif
143
.endif
139
WITH_XIM?=	--with-xim=xlib
144
WITH_XIM?=	--with-xim=xlib
140
WITH_MENUBARS?=	--with-menubars=athena
145
WITH_MENUBARS?=	--enable-menubars=athena
141
WITH_SCROLLBARS?=--with-scrollbars=athena
146
WITH_SCROLLBARS?=--enable-scrollbars=athena
142
WITH_DIALOGS?=	--with-dialogs=athena
147
WITH_DIALOGS?=	--enable-dialogs=athena
143
WITH_WIDGETS?=	--with-widgets=athena
148
WITH_WIDGETS?=	--enable-widgets=athena
144
149
145
.if defined(WITH_XAW3D)
150
.if defined(WITH_XAW3D)
146
CONFIGURE_ARGS+=--with-athena=3d
151
CONFIGURE_ARGS+=--with-athena=3d
(-)editors/xemac-devel-mule/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (xemacs/xemacs-21.5.19.tar.gz) = 75ca89c49b4d99ae00113f8cd1b2a287
1
MD5 (xemacs/xemacs-21.5.20.tar.gz) = 8bf5f1af05588cb59a67bade939c4aeb
2
SIZE (xemacs/xemacs-21.5.19.tar.gz) = 15564957
2
SIZE (xemacs/xemacs-21.5.20.tar.gz) = 11872002
(-)editors/xemac-devel-mule/files/patch-af (-53 lines)
Lines 1-53 Link Here
1
--- configure.in.orig	Fri Feb 14 14:31:16 2003
2
+++ configure.in	Tue Apr 29 21:52:41 2003
3
@@ -1133,6 +1133,7 @@
4
 dnl Straightforward OS determination
5
 case "$canonical" in
6
   *-*-linux*    ) opsys=linux ;;
7
+  *-*-freebsd*   ) opsys=freebsd ;;
8
   *-*-netbsd*   ) opsys=netbsd ;;
9
   *-*-openbsd*	) opsys=openbsd ;;
10
   *-*-nextstep* ) opsys=nextstep ;;
11
@@ -3920,20 +3921,24 @@
12
     test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
13
   fi
14
   dnl Back to our regularly scheduled wnn hunting
15
-  if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
16
-    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
17
-      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
18
-	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
19
-	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
20
+ if test "$with_wnn6" = "yes"; then
21
+   AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
22
+     AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
23
+AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
24
+ else
25
+   if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
26
+     AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
27
+AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
28
+  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
29
+    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
30
+   fi
31
   fi
32
   test -z "$with_wnn" && with_wnn=yes
33
   if test "$with_wnn" = "yes"; then
34
     AC_DEFINE(HAVE_WNN)
35
     XE_PREPEND(-l$libwnn, libs_x)
36
-    if test "$with_wnn6" != "no"; then
37
-      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
38
-      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
39
-    fi
40
+    dnl XE_ADD_OBJS(mule-wnnfns.o) missing here
41
+    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
42
   fi
43
 
44
   dnl Autodetect canna
45
@@ -4526,7 +4531,7 @@
46
 dnl Check for Berkeley DB.
47
 if test "$with_database_berkdb" != "no"; then
48
   AC_MSG_CHECKING(for Berkeley db.h)
49
-  for header in "db/db.h" "db.h"; do
50
+  for header in "/usr/include/db.h" "db/db.h" "db.h"; do
51
     AC_TRY_COMPILE([
52
 #include <stdlib.h>
53
 #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
(-)editors/xemac-devel-mule/files/patch-configure.ac (+82 lines)
Line 0 Link Here
1
Index: configure.ac
2
===================================================================
3
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
4
retrieving revision 1.2
5
diff -u -r1.2 configure.ac
6
--- configure.ac	2005/03/11 11:19:01	1.2
7
+++ configure.ac	2005/03/17 20:16:50
8
@@ -11,7 +11,7 @@
9
 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
10
 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
11
 ac_cpp='$CPP '"$xe_cppflags"
12
-ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
13
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
14
 ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD'
15
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
16
 ])
17
@@ -1148,6 +1148,7 @@
18
 dnl Straightforward OS determination
19
 case "$ac_cv_build" in
20
   *-*-linux*    ) opsys=linux ;;
21
+  *-*-freebsd*	) opsys=freebsd ;;
22
   *-*-netbsd*   ) opsys=netbsd ;;
23
   *-*-openbsd*	) opsys=openbsd ;;
24
   *-*-nextstep* ) opsys=nextstep ;;
25
@@ -1706,12 +1707,12 @@
26
   else cflags_warning_specified=no;
27
 fi
28
 
29
-if test "${cflags_optimization-unset}" != unset
30
+if test "${with_cflags_optimization-unset}" != unset
31
   then cflags_optimization_specified=yes;
32
   else cflags_optimization_specified=no;
33
 fi
34
 
35
-if test "${cflags_debugging-unset}" != unset
36
+if test "${with_cflags_debugging-unset}" != unset
37
   then cflags_debugging_specified=yes;
38
   else cflags_debugging_specified=no;
39
 fi
40
@@ -2048,11 +2049,11 @@
41
 dnl Calculate optimization flags.  These will be off by default in beta
42
 dnl versions and on in release versions.
43
 
44
-if test -z "$with_optimization" ; then
45
-  if test -n "$emacs_is_beta" ; then
46
-    with_optimization=no
47
-  else
48
+if test -z "$with_optimization"; then
49
+  if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then
50
     with_optimization=yes
51
+  else
52
+    with_optimization=no
53
   fi
54
 fi
55
 
56
@@ -3811,7 +3812,7 @@
57
   png_problem=""
58
   test -z "$with_png" && { AC_CHECK_FUNC(pow,                  ,with_png=no) }
59
   test -z "$with_png" && { AC_CHECK_HEADER(png.h,              ,with_png=no) }
60
-  test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) }
61
+  test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no,[-lz]) }
62
   if test -z "$with_png"; then
63
     AC_MSG_CHECKING(for workable png version information)
64
     xe_check_libs="-lpng -lz"
65
@@ -3847,7 +3848,7 @@
66
 
67
   dnl autodetect TIFF
68
   test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h,            ,with_tiff=no) }
69
-  test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) }
70
+  test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no,[-lz]) }
71
   test -z "$with_tiff" && with_tiff=yes
72
   if test "$with_tiff" = "yes"; then
73
     AC_DEFINE(HAVE_TIFF)
74
@@ -4943,7 +4950,7 @@
75
 dnl Check for Berkeley DB.
76
 if test "$enable_database_berkdb" != "no"; then
77
   AC_MSG_CHECKING(for Berkeley db.h)
78
-  for header in "db/db.h" "db.h"; do
79
+  for header in "/usr/include/db.h" "db/db.h" "db.h"; do
80
     AC_TRY_COMPILE([
81
 #include <stdlib.h>
82
 #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
(-)editors/xemac-devel-mule/files/patch-freebsd.h (-11 lines)
Lines 1-11 Link Here
1
--- src/s/freebsd.h.old	Sun Dec 26 00:47:51 2004
2
+++ src/s/freebsd.h	Sun Dec 26 00:48:27 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"
(-)editors/xemac-devel-mule/pkg-plist (-1 / +1 lines)
Lines 67-72 Link Here
67
lib/xemacs-%%XEMACS_VER%%/etc/VEGETABLES
67
lib/xemacs-%%XEMACS_VER%%/etc/VEGETABLES
68
lib/xemacs-%%XEMACS_VER%%/etc/XKeysymDB
68
lib/xemacs-%%XEMACS_VER%%/etc/XKeysymDB
69
lib/xemacs-%%XEMACS_VER%%/etc/cbx.png
69
lib/xemacs-%%XEMACS_VER%%/etc/cbx.png
70
lib/xemacs-%%XEMACS_VER%%/etc/configure-2.13
70
lib/xemacs-%%XEMACS_VER%%/etc/ctags.1
71
lib/xemacs-%%XEMACS_VER%%/etc/ctags.1
71
lib/xemacs-%%XEMACS_VER%%/etc/custom/check0.xpm
72
lib/xemacs-%%XEMACS_VER%%/etc/custom/check0.xpm
72
lib/xemacs-%%XEMACS_VER%%/etc/custom/check1.xpm
73
lib/xemacs-%%XEMACS_VER%%/etc/custom/check1.xpm
Lines 899-905 Link Here
899
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
900
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
900
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
901
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
901
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
902
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
902
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
903
lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
903
lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
904
lib/xemacs-%%XEMACS_VER%%/info/standards.info
904
lib/xemacs-%%XEMACS_VER%%/info/standards.info
905
lib/xemacs-%%XEMACS_VER%%/info/term.info
905
lib/xemacs-%%XEMACS_VER%%/info/term.info

Return to bug 78960