Attachment #106408 for bug #146979

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





PORTNAME=	emacs
PORTVERSION=	${EMACS_VER}
PORTREVISION=	3
PORTEPOCH=	2
CATEGORIES=	editors ipv6
MASTER_SITES=	${MASTER_SITE_GNU}


MAKE_JOBS_UNSAFE=	yes

CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-24.* \
		xemacs-[0-9]* xemacs-devel-[0-9]* \
		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
		emacs-nox11-[0-9]*

INSTALLS_ICONS=	yes


GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_BZIP2=	yes
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
		grep-changelog.1 rcs-checkin.1

		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
		smtpmail speedbar tramp url vip viper widget woman

OPTIONS=	CANNA	"Canna support"			OFF \
		DBUS	"DBus support"			ON \
		GCONF	"GConf support"			ON \
		GIF	"GIF images support"		ON \
		JPEG	"JPEG images support"		ON \
		JPEG	"JPEG support"			ON \
		M17N	"M17N support for text-shaping"	ON \
		MOTIF	"Use Motif widgets"		OFF \
		OTF	"Opentype fonts support"	ON \
		PNG	"PNG images support"		ON \
		SOUND	"Sound support"			ON \
		SOURCES	"Install source code"		ON \
		SVG	"SVG images support"		ON \
		TIFF	"TIFF images support"		ON \
		XAW	"Use Athena widgets"		OFF \
		XAW3D	"Use Athena3D widgets"		OFF \
		XAW3D	"XAW3D support"			OFF \
		SYNC_INPUT	"Synchronously process asynchronous input"	ON \
		SCROLLBARS	"Without toolkit scroll-bars"			ON \
		XFT	"Freetype fonts support"	ON \
		XIM	"X Input Method support"	ON \
		XPM	"XPM images support"		ON

.include <bsd.port.options.mk>

DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}

.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=	--without-x
.else


.if defined(WITHOUT_M17N)
CONFIGURE_ARGS+=	--without-m17n-flt
CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
.else
.if !defined(WITHOUT_XFT)
LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
.endif
CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib -lintl"
.endif

.if defined(WITHOUT_OTF)

CONFIGURE_ARGS+=	--without-xim
.endif

.if defined(WITH_CANNA)
PATCH_SITES+=	${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR+=	nork
PATCHFILES+=	emacs232canna-20100608.patch.gz
PATCH_DIST_STRIP=	-p1
CONFIGURE_ARGS+=	--with-canna \
			--with-canna-includes=${LOCALBASE}/include \
			--with-canna-libraries=${LOCALBASE}/lib
LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
PLIST_SUB+=	CANNA=""
.else
PLIST_SUB+=	CANNA="@comment "
.endif

.endif

.if defined(WITHOUT_SOUND)

.if defined(WITHOUT_DBUS)
CONFIGURE_ARGS+=	--without-dbus
.else
LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
.endif

CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes
.endif

.if defined(WITHOUT_SOURCES)
PLIST_SUB+=	SOURCES="@comment "
.else

	@${RM} -f ${WRKSRC}/info/*
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el

post-configure:
	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile 

.if defined(WITH_SOURCES)
post-install:
	@${MKDIR} ${DATADIR}/${EMACS_VER}/src

	@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif

pre-everything::
	@${ECHO_MSG}
.if !defined(WITHOUT_X11)
	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
.endif
.if defined(WITH_CANNA)
	@${ECHO_MSG} "====> Canna support is not part of standard distribution"
	@${ECHO_MSG} "====> of GNU Emacs and is therefore not supported by GNU"
	@${ECHO_MSG} "====> Emacs development team."
.endif
	@${ECHO_MSG}

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)emacs/distinfo (+3 lines)
1	MD5 (emacs-23.2.tar.bz2) = 057a0379f2f6b85fb114d8c723c79ce2	1	MD5 (emacs-23.2.tar.bz2) = 057a0379f2f6b85fb114d8c723c79ce2
2	SHA256 (emacs-23.2.tar.bz2) = ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5	2	SHA256 (emacs-23.2.tar.bz2) = ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
3	SIZE (emacs-23.2.tar.bz2) = 38376047	3	SIZE (emacs-23.2.tar.bz2) = 38376047
		4	MD5 (emacs232canna-20100608.patch.gz) = d7cc4f928470ef1d28f5e9266846c025
		5	SHA256 (emacs232canna-20100608.patch.gz) = 99d258a1924e9e2500e6ffd073d288f48260f86f24113abf91234cef711f455a
		6	SIZE (emacs232canna-20100608.patch.gz) = 33903





$FreeBSD$

--- configure.orig
+++ configure
@@ -6433,214 +6433,8 @@
 
 
 
-  ALSA_REQUIRED=1.0.0
-  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
-
-  succeeded=no
-
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "$PKG_CONFIG" = "no" ; then
-     HAVE_ALSA=no
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5
-$as_echo_n "checking for $ALSA_MODULES... " >&6; }
-
-        if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5
-$as_echo_n "checking ALSA_CFLAGS... " >&6; }
-            ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
-            { $as_echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
-$as_echo "$ALSA_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:$LINENO: checking ALSA_LIBS" >&5
-$as_echo_n "checking ALSA_LIBS... " >&6; }
-            ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
-            { $as_echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
-$as_echo "$ALSA_LIBS" >&6; }
-        else
-            { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-            ALSA_CFLAGS=""
-            ALSA_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     HAVE_ALSA=yes
-  else
-     HAVE_ALSA=no
-  fi
-
-  if test $HAVE_ALSA = yes; then
-    SAVE_CFLAGS="$CFLAGS"
-    SAVE_LDFLAGS="$LDFLAGS"
-    CFLAGS="$ALSA_CFLAGS $CFLAGS"
-    LDFLAGS="$ALSA_LIBS $LDFLAGS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asoundlib.h>
-int
-main ()
-{
-snd_lib_error_set_handler (0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  emacs_alsa_normal=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	emacs_alsa_normal=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test "$emacs_alsa_normal" != yes; then
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <alsa/asoundlib.h>
-int
-main ()
-{
-snd_lib_error_set_handler (0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  emacs_alsa_subdir=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	emacs_alsa_subdir=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      if test "$emacs_alsa_subdir" != yes; then
-        { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile.  See config.log for error messages." >&5
-$as_echo "$as_me: error: pkg-config found alsa, but it does not compile.  See config.log for error messages." >&2;}
-   { (exit 1); exit 1; }; }
-      fi
-      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
-    fi
-
-    CFLAGS="$SAVE_CFLAGS"
-    LDFLAGS="$SAVE_LDFLAGS"
-    LIBSOUND="$LIBSOUND $ALSA_LIBS"
-    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALSA 1
-_ACEOF
-
-  fi
-
-fi
-
-
 
 
 

Lines 12-15 Link Here

(-)emacs/pkg-descr (+2 lines)
12	read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy	12	read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
13	(Doctor :-) and many more.	13	(Doctor :-) and many more.
14		14
		15	Canna support is contributed by Yuji TAKANO (takachan@running-dog.net).
		16
15	WWW: http://www.gnu.org/software/emacs/	17	WWW: http://www.gnu.org/software/emacs/

Return to bug 146979

Lines 7-13 Link Here

(-)emacs/Makefile (-28 / +52 lines)
7		7
8	PORTNAME= emacs	8	PORTNAME= emacs
9	PORTVERSION= ${EMACS_VER}	9	PORTVERSION= ${EMACS_VER}
10	PORTREVISION= 2	10	PORTREVISION= 3
11	PORTEPOCH= 2	11	PORTEPOCH= 2
12	CATEGORIES= editors ipv6	12	CATEGORIES= editors ipv6
13	MASTER_SITES= ${MASTER_SITE_GNU}	13	MASTER_SITES= ${MASTER_SITE_GNU}
Lines 18-26 Link Here
18		18
19	MAKE_JOBS_UNSAFE= yes	19	MAKE_JOBS_UNSAFE= yes
20		20
21	CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \	21	CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \
22	xemacs-[0-9]* xemacs-devel-[0-9]* \	22	xemacs-[0-9]* xemacs-devel-[0-9]* \
23	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*	23	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
		24	emacs-nox11-[0-9]*
24		25
25	INSTALLS_ICONS= yes	26	INSTALLS_ICONS= yes
26		27
Lines 28-35 Link Here
28	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
29	USE_GMAKE= yes	30	USE_GMAKE= yes
30	USE_BZIP2= yes	31	USE_BZIP2= yes
		32	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
31		33
32	LICENSE= GPLv3	34	LICENSE= GPLv3
		35	LICENSE_FILE= ${WRKSRC}/COPYING
33		36
34	MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \	37	MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
35	grep-changelog.1 rcs-checkin.1	38	grep-changelog.1 rcs-checkin.1
Lines 44-73 Link Here
44	org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \	47	org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
45	smtpmail speedbar tramp url vip viper widget woman	48	smtpmail speedbar tramp url vip viper widget woman
46		49
47	OPTIONS= DBUS "DBus support" ON \	50	OPTIONS= CANNA "Canna support" OFF \
		51	DBUS "DBus support" ON \
48	GCONF "GConf support" ON \	52	GCONF "GConf support" ON \
49	GIF "GIF support" ON \	53	GIF "GIF images support" ON \
50	GTK2 "GTK+ support" ON \	54	JPEG "JPEG images support" ON \
51	JPEG "JPEG support" ON \
52	M17N "M17N support for text-shaping" ON \	55	M17N "M17N support for text-shaping" ON \
53	MOTIF "Motif support" OFF \	56	MOTIF "Use Motif widgets" OFF \
54	OTF "Opentype Font" ON \	57	OTF "Opentype fonts support" ON \
55	PNG "PNG support" ON \	58	PNG "PNG images support" ON \
56	SOUND "Sound support" ON \	59	SOUND "Sound support" ON \
57	SOURCES "Install source code" ON \	60	SOURCES "Install source code" ON \
58	SVG "SVG support" ON \	61	SVG "SVG images support" ON \
59	TIFF "TIFF support" ON \	62	TIFF "TIFF images support" ON \
60	X11 "X11 support" ON \	63	XAW "Use Athena widgets" OFF \
61	XAW "XAW support" OFF \	64	XAW3D "Use Athena3D widgets" OFF \
62	XAW3D "XAW3D support" OFF \
63	SYNC_INPUT "Synchronously process asynchronous input" ON \	65	SYNC_INPUT "Synchronously process asynchronous input" ON \
64	SCROLLBARS "Without toolkit scroll-bars" ON \	66	SCROLLBARS "Without toolkit scroll-bars" ON \
65	XFT "Xft support" ON \	67	XFT "Freetype fonts support" ON \
66	XIM "XIM support" ON \	68	XIM "X Input Method support" ON \
67	XPM "XPM support" ON	69	XPM "XPM images support" ON
68		70
69	.include <bsd.port.options.mk>	71	.include <bsd.port.options.mk>
70		72
		73	DBUS_PTHREAD_LIBS= ${CC} -dumpspecs \| ${GREP} -m 1 pthread: \| ${SED} -e 's\|^.%{\!pg: %{pthread:\|\|' -e 's\|}.$$\|\|' \|\| ${TRUE}
		74
71	.if defined(WITHOUT_X11)	75	.if defined(WITHOUT_X11)
72	CONFIGURE_ARGS+= --without-x	76	CONFIGURE_ARGS+= --without-x
73	.else	77	.else
Lines 160-171 Link Here
160		164
161	.if defined(WITHOUT_M17N)	165	.if defined(WITHOUT_M17N)
162	CONFIGURE_ARGS+= --without-m17n-flt	166	CONFIGURE_ARGS+= --without-m17n-flt
163	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
164	.else	167	.else
165	.if !defined(WITHOUT_XFT)	168	.if !defined(WITHOUT_XFT)
166	LIB_DEPENDS+= m17n.4:${PORTSDIR}/devel/m17n-lib	169	LIB_DEPENDS+= m17n.4:${PORTSDIR}/devel/m17n-lib
167	.endif	170	.endif
168	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl"
169	.endif	171	.endif
170		172
171	.if defined(WITHOUT_OTF)	173	.if defined(WITHOUT_OTF)
Lines 186-191 Link Here
186	CONFIGURE_ARGS+= --without-xim	188	CONFIGURE_ARGS+= --without-xim
187	.endif	189	.endif
188		190
		191	.if defined(WITH_CANNA)
		192	PATCH_SITES+= ${MASTER_SITE_LOCAL}
		193	PATCH_SITE_SUBDIR+= nork
		194	PATCHFILES+= emacs232canna-20100608.patch.gz
		195	PATCH_DIST_STRIP= -p1
		196	CONFIGURE_ARGS+= --with-canna \
		197	--with-canna-includes=${LOCALBASE}/include \
		198	--with-canna-libraries=${LOCALBASE}/lib
		199	LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib
		200	PLIST_SUB+= CANNA=""
		201	.else
		202	PLIST_SUB+= CANNA="@comment "
		203	.endif
		204
189	.endif	205	.endif
190		206
191	.if defined(WITHOUT_SOUND)	207	.if defined(WITHOUT_SOUND)
Lines 195-212 Link Here
195	.if defined(WITHOUT_DBUS)	211	.if defined(WITHOUT_DBUS)
196	CONFIGURE_ARGS+= --without-dbus	212	CONFIGURE_ARGS+= --without-dbus
197	.else	213	.else
198	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus \	214	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
199	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
200	.endif	215	.endif
201		216
202	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
203
204	.include <bsd.port.pre.mk>	217	.include <bsd.port.pre.mk>
205		218
206	.if !defined(WITHOUT_NLS)
207	USE_GETTEXT= yes
208	.endif
209
210	.if defined(WITHOUT_SOURCES)	219	.if defined(WITHOUT_SOURCES)
211	PLIST_SUB+= SOURCES="@comment "	220	PLIST_SUB+= SOURCES="@comment "
212	.else	221	.else
Lines 225-230 Link Here
225	@${RM} -f ${WRKSRC}/info/*	234	@${RM} -f ${WRKSRC}/info/*
226	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el	235	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
227		236
		237	post-configure:
		238	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.\)-pthread\(.\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile
		239
228	.if defined(WITH_SOURCES)	240	.if defined(WITH_SOURCES)
229	post-install:	241	post-install:
230	@${MKDIR} ${DATADIR}/${EMACS_VER}/src	242	@${MKDIR} ${DATADIR}/${EMACS_VER}/src
Lines 232-235 Link Here
232	@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el	244	@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
233	.endif	245	.endif
234		246
		247	pre-everything::
		248	@${ECHO_MSG}
		249	.if !defined(WITHOUT_X11)
		250	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
		251	.endif
		252	.if defined(WITH_CANNA)
		253	@${ECHO_MSG} "====> Canna support is not part of standard distribution"
		254	@${ECHO_MSG} "====> of GNU Emacs and is therefore not supported by GNU"
		255	@${ECHO_MSG} "====> Emacs development team."
		256	.endif
		257	@${ECHO_MSG}
		258
235	.include <bsd.port.post.mk>	259	.include <bsd.port.post.mk>

Line 0 Link Here

(-)emacs/files/patch-configure (+220 lines)
		1
		2	$FreeBSD$
		3
		4	--- configure.orig
		5	+++ configure
		6	@@ -6433,214 +6433,8 @@
		7
		8
		9
		10	- ALSA_REQUIRED=1.0.0
		11	- ALSA_MODULES="alsa >= $ALSA_REQUIRED"
		12	-
		13	- succeeded=no
		14	-
		15	- # Extract the first word of "pkg-config", so it can be a program name with args.
		16	-set dummy pkg-config; ac_word=$2
		17	-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
		18	-$as_echo_n "checking for $ac_word... " >&6; }
		19	-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
		20	- $as_echo_n "(cached) " >&6
		21	-else
		22	- case $PKG_CONFIG in
		23	- [\\/]* \| ?:[\\/]*)
		24	- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
		25	- ;;
		26	- *)
		27	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		28	-for as_dir in $PATH
		29	-do
		30	- IFS=$as_save_IFS
		31	- test -z "$as_dir" && as_dir=.
		32	- for ac_exec_ext in '' $ac_executable_extensions; do
		33	- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
		34	- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
		35	- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
		36	- break 2
		37	- fi
		38	-done
		39	-done
		40	-IFS=$as_save_IFS
		41	-
		42	- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
		43	- ;;
		44	-esac
		45	-fi
		46	-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
		47	-if test -n "$PKG_CONFIG"; then
		48	- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
		49	-$as_echo "$PKG_CONFIG" >&6; }
		50	-else
		51	- { $as_echo "$as_me:$LINENO: result: no" >&5
		52	-$as_echo "no" >&6; }
		53	-fi
		54	-
		55	-
		56	-
		57	- if test "$PKG_CONFIG" = "no" ; then
		58	- HAVE_ALSA=no
		59	- else
		60	- PKG_CONFIG_MIN_VERSION=0.9.0
		61	- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
		62	- { $as_echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5
		63	-$as_echo_n "checking for $ALSA_MODULES... " >&6; }
		64	-
65	- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
66	- { $as_echo "$as_me:$LINENO: result: yes" >&5
67	-$as_echo "yes" >&6; }
68	- succeeded=yes
69	-
70	- { $as_echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5
71	-$as_echo_n "checking ALSA_CFLAGS... " >&6; }
72	- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"\|sed -e 's,///*,/,g'`
73	- { $as_echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
74	-$as_echo "$ALSA_CFLAGS" >&6; }
75	-
76	- { $as_echo "$as_me:$LINENO: checking ALSA_LIBS" >&5
77	-$as_echo_n "checking ALSA_LIBS... " >&6; }
78	- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"\|sed -e 's,///*,/,g'`
79	- { $as_echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
80	-$as_echo "$ALSA_LIBS" >&6; }
81	- else
82	- { $as_echo "$as_me:$LINENO: result: no" >&5
83	-$as_echo "no" >&6; }
84	- ALSA_CFLAGS=""
85	- ALSA_LIBS=""
86	- ## If we have a custom action on failure, don't print errors, but
87	- ## do set a variable so people can do so.
88	- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"`
89	-
90	- fi
91	-
92	-
93	-
94	- else
95	- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
96	- echo "*** See http://www.freedesktop.org/software/pkgconfig"
97	- fi
98	- fi
99	-
100	- if test $succeeded = yes; then
101	- HAVE_ALSA=yes
102	- else
103	- HAVE_ALSA=no
104	- fi
105	-
106	- if test $HAVE_ALSA = yes; then
107	- SAVE_CFLAGS="$CFLAGS"
108	- SAVE_LDFLAGS="$LDFLAGS"
109	- CFLAGS="$ALSA_CFLAGS $CFLAGS"
110	- LDFLAGS="$ALSA_LIBS $LDFLAGS"
111	- cat >conftest.$ac_ext <<_ACEOF
112	-/* confdefs.h. */
113	-_ACEOF
114	-cat confdefs.h >>conftest.$ac_ext
115	-cat >>conftest.$ac_ext <<_ACEOF
116	-/* end confdefs.h. */
117	-#include <asoundlib.h>
118	-int
119	-main ()
120	-{
121	-snd_lib_error_set_handler (0);
122	- ;
123	- return 0;
124	-}
125	-_ACEOF
126	-rm -f conftest.$ac_objext
127	-if { (ac_try="$ac_compile"
128	-case "(($ac_try" in
129	- \" \| \` \| \\) ac_try_echo=\$ac_try;;
130	- *) ac_try_echo=$ac_try;;
131	-esac
132	-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
133	-$as_echo "$ac_try_echo") >&5
134	- (eval "$ac_compile") 2>conftest.er1
135	- ac_status=$?
136	- grep -v '^ *+' conftest.er1 >conftest.err
137	- rm -f conftest.er1
138	- cat conftest.err >&5
139	- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
140	- (exit $ac_status); } && {
141	- test -z "$ac_c_werror_flag" \|\|
142	- test ! -s conftest.err
143	- } && test -s conftest.$ac_objext; then
144	- emacs_alsa_normal=yes
145	-else
146	- $as_echo "$as_me: failed program was:" >&5
147	-sed 's/^/\| /' conftest.$ac_ext >&5
148	-
149	- emacs_alsa_normal=no
150	fi
151
152	-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
153	- if test "$emacs_alsa_normal" != yes; then
154	- cat >conftest.$ac_ext <<_ACEOF
155	-/* confdefs.h. */
156	-_ACEOF
157	-cat confdefs.h >>conftest.$ac_ext
158	-cat >>conftest.$ac_ext <<_ACEOF
159	-/* end confdefs.h. */
160	-#include <alsa/asoundlib.h>
161	-int
162	-main ()
163	-{
164	-snd_lib_error_set_handler (0);
165	- ;
166	- return 0;
167	-}
168	-_ACEOF
169	-rm -f conftest.$ac_objext
170	-if { (ac_try="$ac_compile"
171	-case "(($ac_try" in
172	- \" \| \` \| \\) ac_try_echo=\$ac_try;;
173	- *) ac_try_echo=$ac_try;;
174	-esac
175	-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
176	-$as_echo "$ac_try_echo") >&5
177	- (eval "$ac_compile") 2>conftest.er1
178	- ac_status=$?
179	- grep -v '^ *+' conftest.er1 >conftest.err
180	- rm -f conftest.er1
181	- cat conftest.err >&5
182	- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
183	- (exit $ac_status); } && {
184	- test -z "$ac_c_werror_flag" \|\|
185	- test ! -s conftest.err
186	- } && test -s conftest.$ac_objext; then
187	- emacs_alsa_subdir=yes
188	-else
189	- $as_echo "$as_me: failed program was:" >&5
190	-sed 's/^/\| /' conftest.$ac_ext >&5
191	-
192	- emacs_alsa_subdir=no
193	-fi
194	-
195	-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
196	- if test "$emacs_alsa_subdir" != yes; then
197	- { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&5
198	-$as_echo "$as_me: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&2;}
199	- { (exit 1); exit 1; }; }
200	- fi
201	- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
202	- fi
203	-
204	- CFLAGS="$SAVE_CFLAGS"
205	- LDFLAGS="$SAVE_LDFLAGS"
206	- LIBSOUND="$LIBSOUND $ALSA_LIBS"
207	- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
208	-
209	-cat >>confdefs.h <<\_ACEOF
210	-#define HAVE_ALSA 1
211	-_ACEOF
212	-
213	- fi
214	-
215	-fi
216	-
217	-
218
219
220

Lines 27-32 Link Here

(-)emacs/pkg-plist (+6 lines)
27	%%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR	27	%%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR
28	%%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB	28	%%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
29	%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1	29	%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
		30	%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
30	%%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS	31	%%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS
31	%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF	32	%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF
32	%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.README	33	%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.README
Lines 1137-1142 Link Here
1137	%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/timeclock.elc	1138	%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/timeclock.elc
1138	%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.el.gz	1139	%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.el.gz
1139	%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.elc	1140	%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.elc
		1141	%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/canna.el.gz
		1142	%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/canna.elc
1140	%%DATADIR%%/%%EMACS_VER%%/lisp/case-table.el.gz	1143	%%DATADIR%%/%%EMACS_VER%%/lisp/case-table.el.gz
1141	%%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc	1144	%%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc
1142	%%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz	1145	%%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz
Lines 2323-2328 Link Here
2323	%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc	2326	%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc
2324	%%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz	2327	%%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
2325	%%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc	2328	%%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
		2329	%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.elc
		2330	%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.el.gz
2326	%%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz	2331	%%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
2327	%%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.elc	2332	%%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.elc
2328	%%DATADIR%%/%%EMACS_VER%%/lisp/iswitchb.el.gz	2333	%%DATADIR%%/%%EMACS_VER%%/lisp/iswitchb.el.gz
Lines 3541-3546 Link Here
3541	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c	3546	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c
3542	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c	3547	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c
3543	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c	3548	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c
		3549	%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/src/canna.c
3544	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casefiddle.c	3550	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casefiddle.c
3545	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casetab.c	3551	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casetab.c
3546	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/category.c	3552	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/category.c