diff options
| author | ashish <ashish@FreeBSD.org> | 2013-03-30 05:13:30 +0000 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2013-03-30 05:13:30 +0000 |
| commit | 32302418f14903d353b6fa4f309d516ab89ad14a (patch) | |
| tree | b7bada52f6c86c598f322b8419f7e1f930917b31 | |
| parent | c91a7b7685cb9c69c0ab606d450674097a4834c9 (diff) | |
| download | FreeBSD-ports-32302418f14903d353b6fa4f309d516ab89ad14a.zip FreeBSD-ports-32302418f14903d353b6fa4f309d516ab89ad14a.tar.gz | |
GNU Emacs updates
editors/emacs:
- Update to 24.3
- Update CANNA patchset[1]
- Unbreak ARM support by using the patch from emacs-devel port
- Add missing INSTALLS_ICONS[2]
- Remove a patch which is already integrated upstream
- Fix Makefile header
editors/emacs-devel:
- Update to bzr revision 112178
- Fix Makefile header
- Add missing INSTALLS_ICONS[2]
editors/emacs23:
- Remove ABI versions from LIB_DEPENDS
- Fix Makefile header
- Add missing INSTALLS_ICONS[2]
Mk/bsd.emacs.mk:
- Update major version for editors/emacs port
*:
- Bump PORTREVISION to chase Emacs updates
PR: ports/177428[2]
Submitted by: Yuji TAKANO[1] (via private email), bdrewery[2]
81 files changed, 141 insertions, 242 deletions
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk index f5f6331..d4f71c7 100644 --- a/Mk/bsd.emacs.mk +++ b/Mk/bsd.emacs.mk @@ -117,7 +117,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} # Emacs-24.x .elif (${EMACS_PORT_NAME} == "emacs24") EMACS_NAME= emacs -EMACS_VER= 24.2 +EMACS_VER= 24.3 EMACS_MAJOR_VER= 24 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} diff --git a/audio/emms/Makefile b/audio/emms/Makefile index 49988e5..f679663 100644 --- a/audio/emms/Makefile +++ b/audio/emms/Makefile @@ -7,7 +7,7 @@ PORTNAME= emms PORTVERSION= 3.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= audio elisp MASTER_SITES= GNU diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 0fbed26..dbe693a 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -7,7 +7,7 @@ PORTNAME= dinotrace PORTVERSION= 9.4c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.veripool.org/ftp/ EXTRACT_SUFX= .tgz diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile index 2d25097..07c6d8c 100644 --- a/cad/verilog-mode.el/Makefile +++ b/cad/verilog-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= verilog-mode.el PORTVERSION= 801 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad elisp MASTER_SITES= http://www.veripool.org/ftp/ DISTNAME= ${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E} diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile index 4dad21a..0d957d7 100644 --- a/databases/bbdb/Makefile +++ b/databases/bbdb/Makefile @@ -7,7 +7,7 @@ PORTNAME= bbdb PORTVERSION= 2.35 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases elisp MASTER_SITES= SF PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/databases/lsdb/Makefile b/databases/lsdb/Makefile index 8ae5606..65cb22a 100644 --- a/databases/lsdb/Makefile +++ b/databases/lsdb/Makefile @@ -7,7 +7,7 @@ PORTNAME= lsdb PORTVERSION= 0.11 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases elisp MASTER_SITES= SFJP/${PORTNAME}/7488 PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile index 71c52ea..d9e49c1 100644 --- a/deskutils/howm/Makefile +++ b/deskutils/howm/Makefile @@ -2,6 +2,7 @@ PORTNAME= howm PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://howm.sourceforge.jp/a/ diff --git a/deskutils/org-mode.el/Makefile b/deskutils/org-mode.el/Makefile index a6ae339..ac906ce 100644 --- a/deskutils/org-mode.el/Makefile +++ b/deskutils/org-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= org-mode.el PORTVERSION= 7.8.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils elisp MASTER_SITES= http://orgmode.org/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile index f1f201c..eeace0a 100644 --- a/deskutils/planner.el/Makefile +++ b/deskutils/planner.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= planner.el PORTVERSION= 3.42 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= deskutils elisp MASTER_SITES= http://download.gna.org/planner-el/ \ http://dryice.name/computer/FreeBSD/distfiles/ diff --git a/deskutils/remember.el/Makefile b/deskutils/remember.el/Makefile index 8602611..1294132 100644 --- a/deskutils/remember.el/Makefile +++ b/deskutils/remember.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= remember.el PORTVERSION= 2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= deskutils elisp MASTER_SITES= http://download.gna.org/remember-el/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile index 7e3a30f..a33d7d8 100644 --- a/devel/cedet/Makefile +++ b/devel/cedet/Makefile @@ -7,7 +7,7 @@ PORTNAME= cedet PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel elisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME} PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/devel/distel/Makefile b/devel/distel/Makefile index d7e9f81..0e25e41 100644 --- a/devel/distel/Makefile +++ b/devel/distel/Makefile @@ -2,6 +2,7 @@ PORTNAME= distel PORTVERSION= 2012.05.28 +PORTREVISION= 1 CATEGORIES= devel elisp MAINTAINER= olgeni@FreeBSD.org diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile index c6dd3ce..443b957 100644 --- a/devel/ecb/Makefile +++ b/devel/ecb/Makefile @@ -7,7 +7,7 @@ PORTNAME= ecb PORTVERSION= 2.40 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel elisp MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME:U}%20${PORTVERSION} diff --git a/devel/elib/Makefile b/devel/elib/Makefile index f81ec7f..090193d 100644 --- a/devel/elib/Makefile +++ b/devel/elib/Makefile @@ -7,7 +7,7 @@ PORTNAME= elib PORTVERSION= 1.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel elisp MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ../old-gnu/emacs diff --git a/devel/magit/Makefile b/devel/magit/Makefile index cf2e448..7fcf635 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -2,6 +2,7 @@ PORTNAME= magit PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= devel elisp MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://cloud.github.com/downloads/magit/magit/ diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile index ba7f27b..e2e6298 100644 --- a/devel/p5-Sepia/Makefile +++ b/devel/p5-Sepia/Makefile @@ -7,7 +7,7 @@ PORTNAME= Sepia PORTVERSION= 0.992 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile index 1f3e287..e111bef 100644 --- a/devel/psvn/Makefile +++ b/devel/psvn/Makefile @@ -3,7 +3,7 @@ PORTNAME= psvn PORTVERSION= 20120326.212349 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel elisp MASTER_SITES= http://www.xsteve.at/prg/emacs/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/devel/xtla/Makefile b/devel/xtla/Makefile index 5469768..512139d6 100644 --- a/devel/xtla/Makefile +++ b/devel/xtla/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtla PORTVERSION= 1.2.1 -PORTREVISION= 13 +PORTREVISION= 14 PORTEPOCH= 1 CATEGORIES= devel elisp MASTER_SITES= http://download.gna.org/xtla-el/ \ diff --git a/editors/apel/Makefile b/editors/apel/Makefile index 6987232..bf2bcb7f7e 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apel PORTVERSION= ${APEL_VER} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= editors elisp MASTER_SITES= http://git.chise.org/elisp/dist/apel/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index bde3a4e8..15ae015 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: emacs22 -# Date created: April 12 2005 -# Whom: Kenneth Vestergaard Schmidt <kvs@pil.dk> -# +# Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk> # $FreeBSD$ -# PORTNAME= emacs PORTVERSION= ${EMACS_VER}.${EMACS_REV} @@ -27,7 +23,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ emacs-nox11-[0-9]* EMACS_VER= 24.3.50 -EMACS_REV= 111818 +EMACS_REV= 112178 GNU_CONFIGURE= yes USE_GMAKE= yes USE_NCURSES= yes @@ -37,6 +33,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_AUTOTOOLS= autoconf:env automake:env aclocal:env autoheader:env +INSTALLS_ICONS= yes EMACS_DIRS= ${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ ${PREFIX}/libexec/${PORTNAME} diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index e8a0f74..ccba8a7 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (emacs-24.3.50.111818.tar.xz) = 81078efd9313414c86bcd4352d11b0ee309d17f413eaf0a4643e09669febac73 -SIZE (emacs-24.3.50.111818.tar.xz) = 31767196 +SHA256 (emacs-24.3.50.112178.tar.xz) = 872ed1ad563c054e9e648d4506dd79e8e3bc9d4924356751d7a51c18fa7d454f +SIZE (emacs-24.3.50.112178.tar.xz) = 31457968 diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac index c0c4c23..a744d3f 100644 --- a/editors/emacs-devel/files/patch-configure.ac +++ b/editors/emacs-devel/files/patch-configure.ac @@ -3,7 +3,7 @@ $FreeBSD$ --- configure.ac.orig +++ configure.ac -@@ -1240,39 +1240,10 @@ +@@ -1150,39 +1150,10 @@ AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) AC_SUBST(LIBSOUND) @@ -44,10 +44,10 @@ $FreeBSD$ case "$opsys" in dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ gnu-linux|freebsd|netbsd) -@@ -1289,7 +1260,7 @@ +@@ -1199,7 +1170,7 @@ linux/version.h sys/systeminfo.h coff.h pty.h - sys/vlimit.h sys/resource.h + sys/resource.h - sys/utsname.h pwd.h utmp.h util.h) + sys/utsname.h pwd.h utmp.h util.h libutil.h) diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index ee0943c..313720c 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: GNU emacs -# Date created: 11 October 2001 -# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com> -# +# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com> # $FreeBSD$ -# PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION?= 1 PORTEPOCH= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -25,7 +20,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* -EMACS_VER= 24.2 +EMACS_VER= 24.3 GNU_CONFIGURE= yes USE_GMAKE= yes USE_NCURSES= yes @@ -34,9 +29,10 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +INSTALLS_ICONS= yes MAN1= ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ - grep-changelog.1 rcs-checkin.1 + grep-changelog.1 MANCOMPRESSED= yes PLIST_SUB= EMACS_VER=${EMACS_VER} @@ -45,12 +41,12 @@ EMACS_DIRS= ${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR} MAKE_ENV= LC_ALL=C -INFO= ada-mode auth autotype calc ccmode cl dbus dired-x \ +INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \ ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs-gnutls emacs epa \ - erc ert eshell eudc flymake forms gnus idlwave info \ + erc ert eshell eudc flymake forms gnus htmlfontify idlwave info \ mairix-el message mh-e newsticker nxml-mode \ org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \ - smtpmail speedbar tramp url vip viper widget woman + smtpmail speedbar srecode tramp url vip viper widget wisent woman .if !defined(EMACS_NO_X11_SLAVE) CONFLICTS+= emacs-nox11-[0-9]* @@ -84,7 +80,7 @@ DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{ .if ${PORT_OPTIONS:MCANNA} PATCH_SITES+= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR+= ashish -PATCHFILES+= emacs24.1canna-20120614.diff.gz +PATCHFILES+= emacs24.3canna-20130321.diff.gz PATCH_DIST_STRIP= -p1 CONFIGURE_ARGS+= --with-canna \ --with-canna-includes=${LOCALBASE}/include \ @@ -246,9 +242,7 @@ CONFIGURE_ARGS+= --without-gnutls .include <bsd.port.pre.mk> -.if ${ARCH} == "arm" -BROKEN= Emacs 24.X does not currently build on arm -.elif ${ARCH} == "ia64" +.if ${ARCH} == "ia64" BROKEN= Emacs 24.X does not currently build on ia64 .endif diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 6bd98c9..2730da5 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -SHA256 (emacs-24.2.tar.xz) = 1f11b65520611d108eceea886cc1d2573704e18b19aded8a09b75fdea7eb0ddd -SIZE (emacs-24.2.tar.xz) = 34712012 -SHA256 (emacs24.1canna-20120614.diff.gz) = 276bbaae3b2adca9b1598653ea24986c29564afdea4b6741cbaee71db4f52bbe -SIZE (emacs24.1canna-20120614.diff.gz) = 31907 +SHA256 (emacs-24.3.tar.xz) = 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d +SIZE (emacs-24.3.tar.xz) = 35565352 +SHA256 (emacs24.3canna-20130321.diff.gz) = 9031dcda23f0a289a3318f3437fecb132b4e755f79cd832bf45cee5258b11e71 +SIZE (emacs24.3canna-20130321.diff.gz) = 31492 diff --git a/editors/emacs/files/patch-Makefile.in b/editors/emacs/files/patch-Makefile.in index 6ec4e27..a957d9e 100644 --- a/editors/emacs/files/patch-Makefile.in +++ b/editors/emacs/files/patch-Makefile.in @@ -3,41 +3,12 @@ $FreeBSD$ --- Makefile.in.orig +++ Makefile.in -@@ -518,14 +518,6 @@ - - install-arch-indep: mkdir info install-etc - -set ${COPYDESTS} ; \ -- unset CDPATH; \ -- for dir in ${COPYDIR} ; do \ -- if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ -- rm -rf $$1 ; \ -- fi ; \ -- shift ; \ -- done -- -set ${COPYDESTS} ; \ - mkdir ${COPYDESTS} ; \ - chmod ugo+rx ${COPYDESTS} ; \ - unset CDPATH; \ -@@ -625,10 +617,10 @@ +@@ -610,7 +610,7 @@ cd ${srcdir}/info ; \ - for elt in $(INFO_FILES); do \ + for elt in ${INFO_NONMISC} $${info_misc}; do \ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ - for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ -+ for f in `ls $$elt 2>/dev/null`; do \ ++ for f in `ls $$elt 2>/dev/null`; do \ (cd $${thisdir}; \ -- ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ -- chmod a+r $(DESTDIR)${infodir}/$$f; \ -+ ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f.info); \ -+ chmod a+r $(DESTDIR)${infodir}/$$f.info; \ - if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ - rm -f $(DESTDIR)${infodir}/$$f.gz; \ - ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ -@@ -643,7 +635,7 @@ - for elt in $(INFO_FILES); do \ - test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ - (cd $${thisdir}; \ -- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ -+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \ - done; \ - else true; fi - -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} + ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ + ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ diff --git a/editors/emacs/files/patch-configure b/editors/emacs/files/patch-configure index 014058c..dbe02b6 100644 --- a/editors/emacs/files/patch-configure +++ b/editors/emacs/files/patch-configure @@ -3,7 +3,15 @@ $FreeBSD$ --- configure.orig +++ configure -@@ -8283,159 +8283,6 @@ +@@ -3238,6 +3238,7 @@ + as_fn_append ac_header_list " utmp.h" + as_fn_append ac_header_list " dirent.h" + as_fn_append ac_header_list " util.h" ++as_fn_append ac_header_list " libutil.h" + as_fn_append ac_header_list " sys/socket.h" + as_fn_append ac_header_list " stdlib.h" + as_fn_append ac_header_list " unistd.h" +@@ -8627,116 +8628,6 @@ LIBSOUND= fi @@ -14,48 +22,6 @@ $FreeBSD$ - - 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_PKG_CONFIG+:} false; 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:${as_lineno-$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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- - if test "$PKG_CONFIG" = "no" ; then - HAVE_ALSA=no - else @@ -64,30 +30,29 @@ $FreeBSD$ - { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } +- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5 && +- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES" 2>&5` && +- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES" 2>&5`; then +- edit_cflags=" +- s,///*,/,g +- s/^/ / +- s/ -I/ $isystem/g +- s/^ // +- " +- ALSA_CFLAGS=`$as_echo "$ALSA_CFLAGS" | sed -e "$edit_cflags"` +- ALSA_LIBS=`$as_echo "$ALSA_LIBS" | sed -e 's,///*,/,g'` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&5 +-$as_echo "yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&6; } - succeeded=yes -- -- { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5 --$as_echo "$ALSA_CFLAGS" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 --$as_echo "$ALSA_LIBS" >&6; } - else - { $as_echo "$as_me:${as_lineno-$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"` +- ## do set a variable so people can do so. Do it in a subshell +- ## to capture any diagnostics in invoking pkg-config. +- ALSA_PKG_ERRORS=`($PKG_CONFIG --print-errors "$ALSA_MODULES") 2>&1` - - fi - @@ -163,12 +128,3 @@ $FreeBSD$ if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then case "$opsys" in gnu-linux|freebsd|netbsd) -@@ -8453,7 +8300,7 @@ - linux/version.h sys/systeminfo.h \ - stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \ - sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ -- sys/utsname.h pwd.h utmp.h dirent.h util.h -+ sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/editors/emacs/files/patch-src_s_freebsd.h b/editors/emacs/files/patch-src_s_freebsd.h deleted file mode 100644 index 9dcdd97..0000000 --- a/editors/emacs/files/patch-src_s_freebsd.h +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- src/s/freebsd.h.orig -+++ src/s/freebsd.h -@@ -58,3 +58,17 @@ - /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the jmp_buf. */ - #define GC_SETJMP_WORKS 1 -+ -+#define PTY_ITERATION int i; for (i = 0; i < 1; i++) -+#define PTY_NAME_SPRINTF /* none */ -+#define PTY_TTY_NAME_SPRINTF /* none */ -+#define PTY_OPEN \ -+ do \ -+ { \ -+ int slave; \ -+ if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) \ -+ fd = -1; \ -+ else \ -+ emacs_close (slave); \ -+ } \ -+ while (0) diff --git a/editors/emacs/files/patch-src_sysdep.c b/editors/emacs/files/patch-src_sysdep.c index a5c26fd..7b03201 100644 --- a/editors/emacs/files/patch-src_sysdep.c +++ b/editors/emacs/files/patch-src_sysdep.c @@ -9,12 +9,12 @@ $FreeBSD$ +#ifdef __FreeBSD__ +#include <sys/sysctl.h> -+/* machine/frame.h in Sparc has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */ -+#ifdef __sparc__ ++/* machine/frame.h in Sparc/ARM has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */ ++#if defined(__sparc__) || defined(__arm__) +#define frame freebsd_sparc_frame +#endif +#include <sys/user.h> -+#ifdef __sparc__ ++#if defined(__sparc__) || defined(__arm__) +#undef frame +#endif +#include <sys/resource.h> diff --git a/editors/emacs/files/patch-src_term.c b/editors/emacs/files/patch-src_term.c index f1b25cf..a623a18 100644 --- a/editors/emacs/files/patch-src_term.c +++ b/editors/emacs/files/patch-src_term.c @@ -1,22 +1,23 @@ + $FreeBSD$ $NetBSD: patch-ag,v 1.13 2010/05/15 10:00:57 roy Exp $ - + When running terminfo but compiled for termcap, we cannot assume that we actually have anything useable in termcap_term_buffer so just use the terminfo fixed size defined ealier. ---- src/term.c 2010-01-06 10:11:04.000000000 +0000 -+++ src/term.c 2010-01-06 10:11:53.000000000 +0000 -@@ -3590,11 +3590,6 @@ - #endif +--- src/term.c.orig ++++ src/term.c +@@ -3111,11 +3111,6 @@ + terminal_type); } -#ifndef TERMINFO - if (strlen (tty->termcap_term_buffer) >= buffer_size) -- abort (); +- emacs_abort (); - buffer_size = strlen (tty->termcap_term_buffer); -#endif - tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size); + tty->termcap_strings_buffer = area = xmalloc (buffer_size); tty->TS_ins_line = tgetstr ("al", address); tty->TS_ins_multi_lines = tgetstr ("AL", address); diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist index 4c08849..9afefdf 100644 --- a/editors/emacs/pkg-plist +++ b/editors/emacs/pkg-plist @@ -5,20 +5,15 @@ bin/emacs-%%EMACS_VER%% bin/emacsclient bin/etags bin/grep-changelog -bin/rcs-checkin share/applications/emacs.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el %%DATADIR%%/site-lisp/subdirs.el share/icons/hicolor/128x128/apps/emacs.png share/icons/hicolor/16x16/apps/emacs.png -share/icons/hicolor/16x16/apps/emacs22.png share/icons/hicolor/24x24/apps/emacs.png -share/icons/hicolor/24x24/apps/emacs22.png share/icons/hicolor/32x32/apps/emacs.png -share/icons/hicolor/32x32/apps/emacs22.png share/icons/hicolor/48x48/apps/emacs.png -share/icons/hicolor/48x48/apps/emacs22.png share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg @dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 3910bcc..8588452 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: GNU emacs -# Date created: 11 October 2001 -# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com> -# +# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com> # $FreeBSD$ -# PORTNAME= emacs PORTVERSION= ${EMACS_VER} @@ -36,6 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} LATEST_LINK= emacs23 +INSTALLS_ICONS= yes MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ grep-changelog.1 rcs-checkin.1 @@ -114,19 +111,19 @@ CONFIGURE_ARGS+= --without-sync-input .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg .else CONFIGURE_ARGS+= --without-jpeg .endif .if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff .else CONFIGURE_ARGS+= --without-tiff .endif .if ${PORT_OPTIONS:MGIF} -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib +LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib .else CONFIGURE_ARGS+= --without-gif .endif @@ -145,17 +142,17 @@ CONFIGURE_ARGS+= --without-xpm .if ${PORT_OPTIONS:MXFT} USE_XORG+= xft -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --with-xft .if ${PORT_OPTIONS:MM17N} CONFIGURE_ARGS+= --with-m17n-flt -LIB_DEPENDS+= m17n.4:${PORTSDIR}/devel/m17n-lib +LIB_DEPENDS+= m17n:${PORTSDIR}/devel/m17n-lib .else CONFIGURE_ARGS+= --without-m17n-flt .endif .if ${PORT_OPTIONS:MOTF} CONFIGURE_ARGS+= --with-otf -LIB_DEPENDS+= otf.0:${PORTSDIR}/print/libotf +LIB_DEPENDS+= otf:${PORTSDIR}/print/libotf .else CONFIGURE_ARGS+= --without-libotf .endif @@ -187,7 +184,7 @@ 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 +LIB_DEPENDS+= canna:${PORTSDIR}/japanese/canna-lib .endif .endif @@ -199,7 +196,7 @@ CONFIGURE_ARGS+= --without-sound .endif .if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus +LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus CONFIGURE_ARGS+= --with-dbus .else CONFIGURE_ARGS+= --without-dbus diff --git a/editors/flim/Makefile b/editors/flim/Makefile index b7b743b..fc570b0 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -3,7 +3,7 @@ PORTNAME= flim PORTVERSION= ${FLIM_VER} -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 1 CATEGORIES= editors elisp MASTER_SITES= http://git.chise.org/elisp/dist/flim/flim-1.14/ diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index ceae14a..3f343b9 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnuserv PORTVERSION= 3.12.8 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= editors MASTER_SITES= http://meltin.net/hacks/emacs/src/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile index 487373b..bb64631 100644 --- a/editors/mode-info/Makefile +++ b/editors/mode-info/Makefile @@ -7,7 +7,7 @@ PORTNAME= mode-info PORTVERSION= 0.8.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= editors elisp MASTER_SITES= http://namazu.org/~tsuchiya/elisp/ diff --git a/editors/nxml/Makefile b/editors/nxml/Makefile index 6d7c980..4c6f800 100644 --- a/editors/nxml/Makefile +++ b/editors/nxml/Makefile @@ -7,7 +7,7 @@ PORTNAME= nxml-mode PORTVERSION= ${NXML_VER} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= editors elisp MASTER_SITES= http://www.thaiopensource.com/download/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile index 871a28e..034e4dc 100644 --- a/editors/paredit-mode.el/Makefile +++ b/editors/paredit-mode.el/Makefile @@ -2,7 +2,7 @@ PORTNAME= paredit-mode.el PORTVERSION= 22 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors elisp MASTER_SITES= http://mumble.net/~campbell/emacs/ DISTNAME= paredit-22.el diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile index 0ba4b59..2efa4c0 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -7,7 +7,7 @@ PORTNAME= psgml PORTVERSION= 1.3.2 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= editors elisp MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/editors/semi/Makefile b/editors/semi/Makefile index 874fc39..9b47590 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -3,7 +3,7 @@ PORTNAME= semi PORTVERSION= ${SEMI_VER} -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= editors elisp MASTER_SITES= http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/editors/slime/Makefile b/editors/slime/Makefile index 5acb7f9..2424f68 100644 --- a/editors/slime/Makefile +++ b/editors/slime/Makefile @@ -7,7 +7,7 @@ PORTNAME= slime PORTVERSION= 20110714 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= editors elisp MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 8300acf..2120e8a 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -3,7 +3,7 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile index 1cbd33a..36b1c78 100644 --- a/editors/tree-widget/Makefile +++ b/editors/tree-widget/Makefile @@ -7,7 +7,7 @@ PORTNAME= tree-widget PORTVERSION= 2.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= editors elisp MASTER_SITES= SF/emhacks/${PORTNAME}/${PORTVERSION} \ http://dryice.name/computer/FreeBSD/distfiles/ diff --git a/editors/yasnippet/Makefile b/editors/yasnippet/Makefile index de73276..0d8d990 100644 --- a/editors/yasnippet/Makefile +++ b/editors/yasnippet/Makefile @@ -2,7 +2,7 @@ PORTNAME= yasnippet PORTVERSION= 0.6.1c -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/irc/riece/Makefile b/irc/riece/Makefile index 8510373..ad0e1ed 100644 --- a/irc/riece/Makefile +++ b/irc/riece/Makefile @@ -3,6 +3,7 @@ PORTNAME= riece PORTVERSION= 9.0.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= irc elisp MASTER_SITES= SAVANNAH diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile index 6672504..8956a9f 100644 --- a/japanese/ddskk/Makefile +++ b/japanese/ddskk/Makefile @@ -3,6 +3,7 @@ PORTNAME= ddskk PORTVERSION= 15.1 +PORTREVISION= 1 CATEGORIES= japanese elisp MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/ \ ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \ diff --git a/japanese/egg-canna/Makefile b/japanese/egg-canna/Makefile index bd95067..eb54bc6 100644 --- a/japanese/egg-canna/Makefile +++ b/japanese/egg-canna/Makefile @@ -7,7 +7,7 @@ PORTNAME= egg-canna PORTVERSION= 20011110 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= japanese editors elisp MASTER_SITES= http://cgi18.plala.or.jp/nyy/canna/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index 032b059..52926d2 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -3,7 +3,7 @@ PORTNAME= lookup PORTVERSION= 1.4.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= japanese elisp MASTER_SITES= http://openlab.ring.gr.jp/edict/lookup/dist/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile index a68ccfb..b9d8ca3 100644 --- a/japanese/navi2ch/Makefile +++ b/japanese/navi2ch/Makefile @@ -7,7 +7,7 @@ PORTNAME= navi2ch PORTVERSION= 1.8.4 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= japanese www elisp MASTER_SITES= SF diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile index 07d7f28..5dd5fb3 100644 --- a/japanese/yc.el/Makefile +++ b/japanese/yc.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= yc.el PORTVERSION= 5.2.1 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= japanese elisp MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/ diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile index d6ba606..8872101 100644 --- a/lang/bigloo/Makefile +++ b/lang/bigloo/Makefile @@ -3,6 +3,7 @@ PORTNAME= bigloo PORTVERSION= 4.0a +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= ftp://ftp-sop.inria.fr/indes/fp/Bigloo/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/lang/clojure-mode.el/Makefile b/lang/clojure-mode.el/Makefile index 336a40c..b8659bf 100644 --- a/lang/clojure-mode.el/Makefile +++ b/lang/clojure-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= clojure-mode.el PORTVERSION= 20090718 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang elisp MASTER_SITES= http://distfiles.scode.org/ports/ DISTNAME= clojure-mode-${PORTVERSION} diff --git a/lang/csharp-mode.el/Makefile b/lang/csharp-mode.el/Makefile index f6b4fbe..afab20a 100644 --- a/lang/csharp-mode.el/Makefile +++ b/lang/csharp-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= csharp-mode.el PORTVERSION= 0.8.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang elisp MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME:S|.el$||}-${PORTVERSION}.el diff --git a/lang/ocaml-mode.el/Makefile b/lang/ocaml-mode.el/Makefile index 420d828..f41e2f8 100644 --- a/lang/ocaml-mode.el/Makefile +++ b/lang/ocaml-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= caml-mode PORTVERSION= 3.01 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= lang elisp MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \ ${MASTER_SITE_LOCAL} diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile index aecf199..74563d4 100644 --- a/lang/tuareg-mode.el/Makefile +++ b/lang/tuareg-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuareg-mode PORTVERSION= 1.45.6 -PORTREVISION= 12 +PORTREVISION= 13 PORTEPOCH= 1 CATEGORIES= lang elisp MASTER_SITES= http://www-rocq.inria.fr/~acohen/tuareg/mode/ diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile index c8c07fd..9f93fcf 100644 --- a/mail/c-sig/Makefile +++ b/mail/c-sig/Makefile @@ -3,7 +3,7 @@ PORTNAME= c-sig PORTVERSION= 3.8 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= mail elisp MASTER_SITES= LOCAL MASTER_SITE_SUBDIR= tota/${PORTNAME} diff --git a/mail/emh/Makefile b/mail/emh/Makefile index 2b0b15b..aa26f9f 100644 --- a/mail/emh/Makefile +++ b/mail/emh/Makefile @@ -3,7 +3,7 @@ PORTNAME= emh PORTVERSION= 1.14.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= mail elisp MASTER_SITES= RINGSERVER/elisp/semi/semi-1.14-for-flim-1.14 PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index 53713f1..20d52cb 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -7,7 +7,7 @@ PORTNAME= mailcrypt PORTVERSION= 3.5.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 3155e83..8b4aa56 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -8,7 +8,7 @@ PORTNAME= mew PORTVERSION= 6.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail elisp MASTER_SITES= http://www.mew.org/Release/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/mail/vm/Makefile b/mail/vm/Makefile index 902c63a..9bd101c 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -7,7 +7,7 @@ PORTNAME= vm PORTVERSION= 8.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail elisp MASTER_SITES= https://launchpad.net/${PORTNAME}/8.1.x/${PORTVERSION}/+download/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile index 7450075..6554058 100644 --- a/mail/wanderlust-devel/Makefile +++ b/mail/wanderlust-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= wanderlust PORTVERSION= 2.15.9.b.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= mail elisp MASTER_SITES= http://www.jpl.org/ftp/pub/github-snapshots/ \ ${MASTER_SITE_LOCAL} diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index 6e46f93..a46740a 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -7,7 +7,7 @@ PORTNAME= wanderlust PORTVERSION= 2.14.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail elisp MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \ diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile index af497e0..1bcd2bb 100644 --- a/mail/x-face-e21/Makefile +++ b/mail/x-face-e21/Makefile @@ -7,7 +7,7 @@ PORTNAME= x-face-e21 PORTVERSION= 20070306 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= mail elisp MASTER_SITES= http://www.jpl.org/elips/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile index 053680c..f75193f 100644 --- a/mail/xcite/Makefile +++ b/mail/xcite/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcite PORTVERSION= 1.60 -PORTREVISION= 13 +PORTREVISION= 19 PORTREVISION= 5 CATEGORIES= mail elisp MASTER_SITES= http://www.gentei.org/~yuuji/software/ diff --git a/math/ess/Makefile b/math/ess/Makefile index 16a336e..0adec84 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -3,7 +3,7 @@ PORTNAME= ess DISTVERSION= 12.09-2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://ess.r-project.org/downloads/ess/ EXTRACT_SUFX= .tgz diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile index 25ca9ba..284fce6 100644 --- a/math/proofgeneral/Makefile +++ b/math/proofgeneral/Makefile @@ -7,7 +7,7 @@ PORTNAME= proofgeneral PORTVERSION= 4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math elisp MASTER_SITES= http://proofgeneral.inf.ed.ac.uk/releases/ PKGNAMESUFFIX= -${EMACS_NAME} diff --git a/misc/color-theme.el/Makefile b/misc/color-theme.el/Makefile index 87b9543..59ddb4c 100644 --- a/misc/color-theme.el/Makefile +++ b/misc/color-theme.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= color-theme.el PORTVERSION= 6.6.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= misc elisp MASTER_SITES= http://download.gna.org/color-theme/ PKGNAMESUFFIX= -${EMACS_NAME} diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index 162f4d3..e5623e4 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -7,7 +7,7 @@ PORTNAME= elscreen PORTVERSION= 1.4.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc elisp MASTER_SITES= ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/%SUBDIR%/ MASTER_SITE_SUBDIR= . old diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile index 4fe5755..a9d68f2 100644 --- a/net-im/jabber.el/Makefile +++ b/net-im/jabber.el/Makefile @@ -6,7 +6,7 @@ PORTNAME= jabber.el PORTVERSION= 0.8.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net-im elisp MASTER_SITES= SF/emacs-jabber/emacs-jabber/${PORTVERSION} DISTNAME= emacs-jabber-${PORTVERSION} diff --git a/net/tramp/Makefile b/net/tramp/Makefile index 23cc621..d186aea 100644 --- a/net/tramp/Makefile +++ b/net/tramp/Makefile @@ -3,6 +3,7 @@ PORTNAME= tramp PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= net elisp MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 29189de..559bb05 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -3,6 +3,7 @@ PORTNAME= auctex PORTVERSION= 11.87 +PORTREVISION= 1 CATEGORIES= print elisp MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/security/easypg/Makefile b/security/easypg/Makefile index b1525ad..32c579d 100644 --- a/security/easypg/Makefile +++ b/security/easypg/Makefile @@ -7,7 +7,7 @@ PORTNAME= easypg PORTVERSION= 0.0.16 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= security elisp MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= epg/29289 diff --git a/security/starttls/Makefile b/security/starttls/Makefile index debee23..dd7ffaf 100644 --- a/security/starttls/Makefile +++ b/security/starttls/Makefile @@ -7,7 +7,7 @@ PORTNAME= starttls PORTVERSION= 0.10 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/ diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile index 1dfe5fe..5a4c458 100644 --- a/textproc/dictem/Makefile +++ b/textproc/dictem/Makefile @@ -6,7 +6,7 @@ PORTNAME= dictem PORTVERSION= 1.0.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= textproc net elisp MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION} PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile index ae2d5ca..4efb696 100644 --- a/textproc/dictionary/Makefile +++ b/textproc/dictionary/Makefile @@ -7,7 +7,7 @@ PORTNAME= dictionary PORTVERSION= 1.8.7 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= textproc net elisp MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \ http://bsdchat.com/dist/dryice/ diff --git a/textproc/doc-mode.el/Makefile b/textproc/doc-mode.el/Makefile index 77aa0a6..2cc5b24 100644 --- a/textproc/doc-mode.el/Makefile +++ b/textproc/doc-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= doc-mode.el PORTVERSION= 1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= textproc elisp MASTER_SITES= SF/xpt/doc-mode/doc-mode-${PORTVERSION} DISTNAME= doc-mode-${PORTVERSION} diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile index 2158a1f..101a156 100644 --- a/textproc/ibus-el/Makefile +++ b/textproc/ibus-el/Makefile @@ -3,6 +3,7 @@ PORTNAME= ibus-el PORTVERSION= 0.3.2 #PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc elisp MASTER_SITES= http://www11.atwiki.jp/s-irie/pub/emacs/ibus/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/textproc/markdown-mode.el/Makefile b/textproc/markdown-mode.el/Makefile index 88716df..e2201a6 100644 --- a/textproc/markdown-mode.el/Makefile +++ b/textproc/markdown-mode.el/Makefile @@ -2,6 +2,7 @@ PORTNAME= markdown-mode.el PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://jblevins.org/projects/markdown-mode/ DISTNAME= markdown-mode.el diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile index f378267..8fab439 100644 --- a/textproc/muse/Makefile +++ b/textproc/muse/Makefile @@ -7,7 +7,7 @@ PORTNAME= muse PORTVERSION= 3.20 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc elisp MASTER_SITES= http://download.gna.org/muse-el/ \ ${MASTER_SITE_LOCAL} \ diff --git a/textproc/rst.el/Makefile b/textproc/rst.el/Makefile index 0a759c8..56413d0 100644 --- a/textproc/rst.el/Makefile +++ b/textproc/rst.el/Makefile @@ -3,7 +3,7 @@ PORTNAME= rst.el PORTVERSION= 6390 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc elisp MASTER_SITES= http://svn.berlios.de/viewcvs/docutils/trunk/docutils/tools/editors/emacs/ PKGNAMESUFFIX= -${EMACS_NAME} diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index fff3cd9..4b84937 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -7,7 +7,7 @@ PORTNAME= uim-el PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/textproc/yaml-mode.el/Makefile b/textproc/yaml-mode.el/Makefile index 1bac518..00437d0 100644 --- a/textproc/yaml-mode.el/Makefile +++ b/textproc/yaml-mode.el/Makefile @@ -3,7 +3,7 @@ PORTNAME= yaml-mode.el PORTVERSION= 0.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc elisp PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index c1cc5dc..6a26388 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -3,7 +3,7 @@ PORTNAME= emacs-w3m PORTVERSION= 1.4.471.b.${SNAPDATE} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www elisp MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nobutaka |
