? emacs-current/emacs.core
? emacs-current/work
? emacs-current/xxx
? emacs-current/patches/patch-ad
Index: emacs-current/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- emacs-current/Makefile	15 Dec 2009 06:44:32 -0000	1.47
+++ emacs-current/Makefile	21 Jun 2010 07:47:05 -0000
@@ -1,9 +1,9 @@
 # $NetBSD$
 #
 
-DISTNAME=	emacs-23.1.90
-PKGNAME=	emacs-23.1.90
-PKGREVISION=	${_CVS_PKGVERSION:S/.//g}
+DISTNAME=	emacs-24.0.50
+#PKGNAME=	emacs-24.0.50
+PKGREVISION=	${_GIT_PKGVERSION:S/.//g}
 CATEGORIES=	editors
 MASTER_SITES=	#
 
@@ -20,8 +20,9 @@
 
 BUILD_TARGET=	bootstrap
 
-CVS_REPOSITORIES=	emacs
-CVS_ROOT.emacs=		${CVS_ROOT_GNU}/emacs
+GIT_REPOSITORIES=	master
+GIT_REPO.master=	git://repo.or.cz/emacs.git
+_GIT_FLAGS?=		--depth 1
 
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
@@ -55,7 +56,11 @@
 post-extract:
 	cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
 
+.include "../../wip/mk/git-package.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
-.include "../../wip/mk/cvs-package.mk"
 .include "../../mk/bsd.pkg.mk"
+
+
+#PKG_DEBUG_LEVEL?=       1
+#_PKG_SILENT=            # was @ here
Index: emacs-current/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/PLIST,v
retrieving revision 1.83
diff -u -r1.83 PLIST
--- emacs-current/PLIST	17 Dec 2009 14:16:57 -0000	1.83
+++ emacs-current/PLIST	21 Jun 2010 07:47:07 -0000
@@ -18,8 +18,8 @@
 info/dired-x
 info/ebrowse
 info/ede
-info/edt
 info/ediff
+info/edt
 info/efaq
 info/eieio
 info/eintr
@@ -64,10 +64,8 @@
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/movemail
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/profile
-libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/update-game-score
-libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
 man/man1/b2m.1
 man/man1/ctags.1
 man/man1/ebrowse.1
@@ -109,6 +107,7 @@
 share/emacs/${PKGVERSION}/etc/NEWS.20
 share/emacs/${PKGVERSION}/etc/NEWS.21
 share/emacs/${PKGVERSION}/etc/NEWS.22
+share/emacs/${PKGVERSION}/etc/NEWS.23
 share/emacs/${PKGVERSION}/etc/NXML-NEWS
 share/emacs/${PKGVERSION}/etc/ORDERS
 share/emacs/${PKGVERSION}/etc/PROBLEMS
@@ -420,8 +419,16 @@
 share/emacs/${PKGVERSION}/etc/images/gud/print.xpm
 share/emacs/${PKGVERSION}/etc/images/gud/pstar.pbm
 share/emacs/${PKGVERSION}/etc/images/gud/pstar.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/rcont.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/recstart.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/recstop.xpm
 share/emacs/${PKGVERSION}/etc/images/gud/remove.pbm
 share/emacs/${PKGVERSION}/etc/images/gud/remove.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/rfinish.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/rnext.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/rnexti.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/rstep.xpm
+share/emacs/${PKGVERSION}/etc/images/gud/rstepi.xpm
 share/emacs/${PKGVERSION}/etc/images/gud/run.pbm
 share/emacs/${PKGVERSION}/etc/images/gud/run.xpm
 share/emacs/${PKGVERSION}/etc/images/gud/step.pbm
@@ -1021,8 +1028,6 @@
 share/emacs/${PKGVERSION}/lisp/abbrev.elc
 share/emacs/${PKGVERSION}/lisp/abbrevlist.el.gz
 share/emacs/${PKGVERSION}/lisp/abbrevlist.elc
-share/emacs/${PKGVERSION}/lisp/add-log.el.gz
-share/emacs/${PKGVERSION}/lisp/add-log.elc
 share/emacs/${PKGVERSION}/lisp/align.el.gz
 share/emacs/${PKGVERSION}/lisp/align.elc
 share/emacs/${PKGVERSION}/lisp/allout.el.gz
@@ -1055,8 +1060,6 @@
 share/emacs/${PKGVERSION}/lisp/buff-menu.elc
 share/emacs/${PKGVERSION}/lisp/button.el.gz
 share/emacs/${PKGVERSION}/lisp/button.elc
-share/emacs/${PKGVERSION}/lisp/calc/README
-share/emacs/${PKGVERSION}/lisp/calc/README.prev
 share/emacs/${PKGVERSION}/lisp/calc/calc-aent.el.gz
 share/emacs/${PKGVERSION}/lisp/calc/calc-aent.elc
 share/emacs/${PKGVERSION}/lisp/calc/calc-alg.el.gz
@@ -1144,6 +1147,8 @@
 share/emacs/${PKGVERSION}/lisp/calc/calccomp.elc
 share/emacs/${PKGVERSION}/lisp/calc/calcsel2.el.gz
 share/emacs/${PKGVERSION}/lisp/calc/calcsel2.elc
+share/emacs/${PKGVERSION}/lisp/calc/README
+share/emacs/${PKGVERSION}/lisp/calc/README.prev
 share/emacs/${PKGVERSION}/lisp/calculator.el.gz
 share/emacs/${PKGVERSION}/lisp/calculator.elc
 share/emacs/${PKGVERSION}/lisp/calendar/appt.el.gz
@@ -1382,6 +1387,8 @@
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/ia.elc
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/idle.el.gz
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/idle.elc
+share/emacs/${PKGVERSION}/lisp/cedet/semantic/imenu.el.gz
+share/emacs/${PKGVERSION}/lisp/cedet/semantic/imenu.elc
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/java.el.gz
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/java.elc
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/lex-spp.el.gz
@@ -1439,6 +1446,10 @@
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/javat-wy.elc
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/js-wy.el.gz
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/js-wy.elc
+share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/python-wy.el.gz
+share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/python-wy.elc
+share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/python.el.gz
+share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/python.elc
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/wisent.el.gz
 share/emacs/${PKGVERSION}/lisp/cedet/semantic/wisent/wisent.elc
 share/emacs/${PKGVERSION}/lisp/cedet/srecode.el.gz
@@ -1498,10 +1509,6 @@
 share/emacs/${PKGVERSION}/lisp/cmuscheme.elc
 share/emacs/${PKGVERSION}/lisp/comint.el.gz
 share/emacs/${PKGVERSION}/lisp/comint.elc
-share/emacs/${PKGVERSION}/lisp/compare-w.el.gz
-share/emacs/${PKGVERSION}/lisp/compare-w.elc
-share/emacs/${PKGVERSION}/lisp/complete.el.gz
-share/emacs/${PKGVERSION}/lisp/complete.elc
 share/emacs/${PKGVERSION}/lisp/completion.el.gz
 share/emacs/${PKGVERSION}/lisp/completion.elc
 share/emacs/${PKGVERSION}/lisp/composite.el.gz
@@ -1519,8 +1526,6 @@
 share/emacs/${PKGVERSION}/lisp/cus-theme.elc
 share/emacs/${PKGVERSION}/lisp/custom.el.gz
 share/emacs/${PKGVERSION}/lisp/custom.elc
-share/emacs/${PKGVERSION}/lisp/cvs-status.el.gz
-share/emacs/${PKGVERSION}/lisp/cvs-status.elc
 share/emacs/${PKGVERSION}/lisp/dabbrev.el.gz
 share/emacs/${PKGVERSION}/lisp/dabbrev.elc
 share/emacs/${PKGVERSION}/lisp/delim-col.el.gz
@@ -1533,10 +1538,6 @@
 share/emacs/${PKGVERSION}/lisp/desktop.elc
 share/emacs/${PKGVERSION}/lisp/dframe.el.gz
 share/emacs/${PKGVERSION}/lisp/dframe.elc
-share/emacs/${PKGVERSION}/lisp/diff-mode.el.gz
-share/emacs/${PKGVERSION}/lisp/diff-mode.elc
-share/emacs/${PKGVERSION}/lisp/diff.el.gz
-share/emacs/${PKGVERSION}/lisp/diff.elc
 share/emacs/${PKGVERSION}/lisp/dired-aux.el.gz
 share/emacs/${PKGVERSION}/lisp/dired-aux.elc
 share/emacs/${PKGVERSION}/lisp/dired-x.el.gz
@@ -1559,32 +1560,12 @@
 share/emacs/${PKGVERSION}/lisp/dos-w32.elc
 share/emacs/${PKGVERSION}/lisp/double.el.gz
 share/emacs/${PKGVERSION}/lisp/double.elc
+share/emacs/${PKGVERSION}/lisp/dynamic-setting.el.gz
+share/emacs/${PKGVERSION}/lisp/dynamic-setting.elc
 share/emacs/${PKGVERSION}/lisp/ebuff-menu.el.gz
 share/emacs/${PKGVERSION}/lisp/ebuff-menu.elc
 share/emacs/${PKGVERSION}/lisp/echistory.el.gz
 share/emacs/${PKGVERSION}/lisp/echistory.elc
-share/emacs/${PKGVERSION}/lisp/ediff-diff.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-diff.elc
-share/emacs/${PKGVERSION}/lisp/ediff-help.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-help.elc
-share/emacs/${PKGVERSION}/lisp/ediff-hook.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-hook.elc
-share/emacs/${PKGVERSION}/lisp/ediff-init.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-init.elc
-share/emacs/${PKGVERSION}/lisp/ediff-merg.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-merg.elc
-share/emacs/${PKGVERSION}/lisp/ediff-mult.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-mult.elc
-share/emacs/${PKGVERSION}/lisp/ediff-ptch.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-ptch.elc
-share/emacs/${PKGVERSION}/lisp/ediff-util.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-util.elc
-share/emacs/${PKGVERSION}/lisp/ediff-vers.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-vers.elc
-share/emacs/${PKGVERSION}/lisp/ediff-wind.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff-wind.elc
-share/emacs/${PKGVERSION}/lisp/ediff.el.gz
-share/emacs/${PKGVERSION}/lisp/ediff.elc
 share/emacs/${PKGVERSION}/lisp/edmacro.el.gz
 share/emacs/${PKGVERSION}/lisp/edmacro.elc
 share/emacs/${PKGVERSION}/lisp/ehelp.el.gz
@@ -1699,6 +1680,10 @@
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/map-ynp.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/map-ynp.elc
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/package.el.gz
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/package.elc
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/package-x.el.gz
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/package-x.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/pp.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/pp.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/re-builder.el.gz
@@ -1713,6 +1698,8 @@
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/rx.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/shadow.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/shadow.elc
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/smie.el.gz
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/smie.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/sregex.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/sregex.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/syntax.el.gz
@@ -1735,8 +1722,6 @@
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/warnings.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lock.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lock.elc
-share/emacs/${PKGVERSION}/lisp/emerge.el.gz
-share/emacs/${PKGVERSION}/lisp/emerge.elc
 share/emacs/${PKGVERSION}/lisp/emulation/crisp.el.gz
 share/emacs/${PKGVERSION}/lisp/emulation/crisp.elc
 share/emacs/${PKGVERSION}/lisp/emulation/cua-base.el.gz
@@ -1973,8 +1958,6 @@
 share/emacs/${PKGVERSION}/lisp/font-core.elc
 share/emacs/${PKGVERSION}/lisp/font-lock.el.gz
 share/emacs/${PKGVERSION}/lisp/font-lock.elc
-share/emacs/${PKGVERSION}/lisp/font-setting.el.gz
-share/emacs/${PKGVERSION}/lisp/font-setting.elc
 share/emacs/${PKGVERSION}/lisp/format-spec.el.gz
 share/emacs/${PKGVERSION}/lisp/format-spec.elc
 share/emacs/${PKGVERSION}/lisp/format.el.gz
@@ -2315,7 +2298,6 @@
 share/emacs/${PKGVERSION}/lisp/info.elc
 share/emacs/${PKGVERSION}/lisp/informat.el.gz
 share/emacs/${PKGVERSION}/lisp/informat.elc
-share/emacs/${PKGVERSION}/lisp/international/README
 share/emacs/${PKGVERSION}/lisp/international/ccl.el.gz
 share/emacs/${PKGVERSION}/lisp/international/ccl.elc
 share/emacs/${PKGVERSION}/lisp/international/characters.el.gz
@@ -2359,6 +2341,7 @@
 share/emacs/${PKGVERSION}/lisp/international/ogonek.elc
 share/emacs/${PKGVERSION}/lisp/international/quail.el.gz
 share/emacs/${PKGVERSION}/lisp/international/quail.elc
+share/emacs/${PKGVERSION}/lisp/international/README
 share/emacs/${PKGVERSION}/lisp/international/robin.el.gz
 share/emacs/${PKGVERSION}/lisp/international/robin.elc
 share/emacs/${PKGVERSION}/lisp/international/titdic-cnv.el.gz
@@ -2468,10 +2451,6 @@
 share/emacs/${PKGVERSION}/lisp/loadup.el
 share/emacs/${PKGVERSION}/lisp/locate.el.gz
 share/emacs/${PKGVERSION}/lisp/locate.elc
-share/emacs/${PKGVERSION}/lisp/log-edit.el.gz
-share/emacs/${PKGVERSION}/lisp/log-edit.elc
-share/emacs/${PKGVERSION}/lisp/log-view.el.gz
-share/emacs/${PKGVERSION}/lisp/log-view.elc
 share/emacs/${PKGVERSION}/lisp/longlines.el.gz
 share/emacs/${PKGVERSION}/lisp/longlines.elc
 share/emacs/${PKGVERSION}/lisp/lpr.el.gz
@@ -2709,6 +2688,8 @@
 share/emacs/${PKGVERSION}/lisp/net/sasl-ntlm.elc
 share/emacs/${PKGVERSION}/lisp/net/sasl.el.gz
 share/emacs/${PKGVERSION}/lisp/net/sasl.elc
+share/emacs/${PKGVERSION}/lisp/net/secrets.el.gz
+share/emacs/${PKGVERSION}/lisp/net/secrets.elc
 share/emacs/${PKGVERSION}/lisp/net/snmp-mode.el.gz
 share/emacs/${PKGVERSION}/lisp/net/snmp-mode.elc
 share/emacs/${PKGVERSION}/lisp/net/socks.el.gz
@@ -2749,9 +2730,10 @@
 share/emacs/${PKGVERSION}/lisp/net/zeroconf.elc
 share/emacs/${PKGVERSION}/lisp/newcomment.el.gz
 share/emacs/${PKGVERSION}/lisp/newcomment.elc
+share/emacs/${PKGVERSION}/lisp/notifications.el.gz
+share/emacs/${PKGVERSION}/lisp/notifications.elc
 share/emacs/${PKGVERSION}/lisp/novice.el.gz
 share/emacs/${PKGVERSION}/lisp/novice.elc
-share/emacs/${PKGVERSION}/lisp/nxml/TODO
 share/emacs/${PKGVERSION}/lisp/nxml/nxml-enc.el.gz
 share/emacs/${PKGVERSION}/lisp/nxml/nxml-enc.elc
 share/emacs/${PKGVERSION}/lisp/nxml/nxml-glyph.el.gz
@@ -2796,12 +2778,15 @@
 share/emacs/${PKGVERSION}/lisp/nxml/rng-valid.elc
 share/emacs/${PKGVERSION}/lisp/nxml/rng-xsd.el.gz
 share/emacs/${PKGVERSION}/lisp/nxml/rng-xsd.elc
+share/emacs/${PKGVERSION}/lisp/nxml/TODO
 share/emacs/${PKGVERSION}/lisp/nxml/xmltok.el.gz
 share/emacs/${PKGVERSION}/lisp/nxml/xmltok.elc
 share/emacs/${PKGVERSION}/lisp/nxml/xsd-regexp.el.gz
 share/emacs/${PKGVERSION}/lisp/nxml/xsd-regexp.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/awk-mode.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/awk-mode.elc
+share/emacs/${PKGVERSION}/lisp/obsolete/complete.el.gz
+share/emacs/${PKGVERSION}/lisp/obsolete/complete.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/fast-lock.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/fast-lock.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/iso-acc.el.gz
@@ -2827,6 +2812,8 @@
 share/emacs/${PKGVERSION}/lisp/obsolete/rnews.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/rnewspost.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/rnewspost.elc
+share/emacs/${PKGVERSION}/lisp/obsolete/s-region.el.gz
+share/emacs/${PKGVERSION}/lisp/obsolete/s-region.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/sc.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/sc.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/scribe.el.gz
@@ -2849,6 +2836,8 @@
 share/emacs/${PKGVERSION}/lisp/org/org-attach.elc
 share/emacs/${PKGVERSION}/lisp/org/org-bbdb.el.gz
 share/emacs/${PKGVERSION}/lisp/org/org-bbdb.elc
+share/emacs/${PKGVERSION}/lisp/org/org-beamer.el.gz
+share/emacs/${PKGVERSION}/lisp/org/org-beamer.elc
 share/emacs/${PKGVERSION}/lisp/org/org-bibtex.el.gz
 share/emacs/${PKGVERSION}/lisp/org/org-bibtex.elc
 share/emacs/${PKGVERSION}/lisp/org/org-clock.el.gz
@@ -2859,10 +2848,16 @@
 share/emacs/${PKGVERSION}/lisp/org/org-compat.elc
 share/emacs/${PKGVERSION}/lisp/org/org-crypt.el.gz
 share/emacs/${PKGVERSION}/lisp/org/org-crypt.elc
+share/emacs/${PKGVERSION}/lisp/org/org-ctags.el.gz
+share/emacs/${PKGVERSION}/lisp/org/org-ctags.elc
 share/emacs/${PKGVERSION}/lisp/org/org-datetree.el.gz
 share/emacs/${PKGVERSION}/lisp/org/org-datetree.elc
 share/emacs/${PKGVERSION}/lisp/org/org-docbook.el.gz
 share/emacs/${PKGVERSION}/lisp/org/org-docbook.elc
+share/emacs/${PKGVERSION}/lisp/org/org-docview.el.gz
+share/emacs/${PKGVERSION}/lisp/org/org-docview.elc
+share/emacs/${PKGVERSION}/lisp/org/org-entities.el.gz
+share/emacs/${PKGVERSION}/lisp/org/org-entities.elc
 share/emacs/${PKGVERSION}/lisp/org/org-exp-blocks.el.gz
 share/emacs/${PKGVERSION}/lisp/org/org-exp-blocks.elc
 share/emacs/${PKGVERSION}/lisp/org/org-exp.el.gz
@@ -2959,16 +2954,6 @@
 share/emacs/${PKGVERSION}/lisp/pcmpl-unix.elc
 share/emacs/${PKGVERSION}/lisp/pcomplete.el.gz
 share/emacs/${PKGVERSION}/lisp/pcomplete.elc
-share/emacs/${PKGVERSION}/lisp/pcvs-defs.el.gz
-share/emacs/${PKGVERSION}/lisp/pcvs-defs.elc
-share/emacs/${PKGVERSION}/lisp/pcvs-info.el.gz
-share/emacs/${PKGVERSION}/lisp/pcvs-info.elc
-share/emacs/${PKGVERSION}/lisp/pcvs-parse.el.gz
-share/emacs/${PKGVERSION}/lisp/pcvs-parse.elc
-share/emacs/${PKGVERSION}/lisp/pcvs-util.el.gz
-share/emacs/${PKGVERSION}/lisp/pcvs-util.elc
-share/emacs/${PKGVERSION}/lisp/pcvs.el.gz
-share/emacs/${PKGVERSION}/lisp/pcvs.elc
 share/emacs/${PKGVERSION}/lisp/pgg-def.el.gz
 share/emacs/${PKGVERSION}/lisp/pgg-def.elc
 share/emacs/${PKGVERSION}/lisp/pgg-gpg.el.gz
@@ -3240,8 +3225,6 @@
 share/emacs/${PKGVERSION}/lisp/rot13.elc
 share/emacs/${PKGVERSION}/lisp/ruler-mode.el.gz
 share/emacs/${PKGVERSION}/lisp/ruler-mode.elc
-share/emacs/${PKGVERSION}/lisp/s-region.el.gz
-share/emacs/${PKGVERSION}/lisp/s-region.elc
 share/emacs/${PKGVERSION}/lisp/savehist.el.gz
 share/emacs/${PKGVERSION}/lisp/savehist.elc
 share/emacs/${PKGVERSION}/lisp/saveplace.el.gz
@@ -3272,8 +3255,6 @@
 share/emacs/${PKGVERSION}/lisp/site-init.elc
 share/emacs/${PKGVERSION}/lisp/skeleton.el.gz
 share/emacs/${PKGVERSION}/lisp/skeleton.elc
-share/emacs/${PKGVERSION}/lisp/smerge-mode.el.gz
-share/emacs/${PKGVERSION}/lisp/smerge-mode.elc
 share/emacs/${PKGVERSION}/lisp/sort.el.gz
 share/emacs/${PKGVERSION}/lisp/sort.elc
 share/emacs/${PKGVERSION}/lisp/soundex.el.gz
@@ -3299,9 +3280,8 @@
 share/emacs/${PKGVERSION}/lisp/tempo.elc
 share/emacs/${PKGVERSION}/lisp/term.el.gz
 share/emacs/${PKGVERSION}/lisp/term.elc
-share/emacs/${PKGVERSION}/lisp/term/AT386.el
-share/emacs/${PKGVERSION}/lisp/term/README
 share/emacs/${PKGVERSION}/lisp/term/apollo.el
+share/emacs/${PKGVERSION}/lisp/term/AT386.el
 share/emacs/${PKGVERSION}/lisp/term/bobcat.el
 share/emacs/${PKGVERSION}/lisp/term/common-win.el.gz
 share/emacs/${PKGVERSION}/lisp/term/common-win.elc
@@ -3316,6 +3296,7 @@
 share/emacs/${PKGVERSION}/lisp/term/ns-win.elc
 share/emacs/${PKGVERSION}/lisp/term/pc-win.el.gz
 share/emacs/${PKGVERSION}/lisp/term/pc-win.elc
+share/emacs/${PKGVERSION}/lisp/term/README
 share/emacs/${PKGVERSION}/lisp/term/rxvt.el.gz
 share/emacs/${PKGVERSION}/lisp/term/rxvt.elc
 share/emacs/${PKGVERSION}/lisp/term/sun.el.gz
@@ -3523,36 +3504,86 @@
 share/emacs/${PKGVERSION}/lisp/url/url.elc
 share/emacs/${PKGVERSION}/lisp/userlock.el.gz
 share/emacs/${PKGVERSION}/lisp/userlock.elc
-share/emacs/${PKGVERSION}/lisp/vc-annotate.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-annotate.elc
-share/emacs/${PKGVERSION}/lisp/vc-arch.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-arch.elc
-share/emacs/${PKGVERSION}/lisp/vc-bzr.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-bzr.elc
-share/emacs/${PKGVERSION}/lisp/vc-cvs.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-cvs.elc
-share/emacs/${PKGVERSION}/lisp/vc-dav.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-dav.elc
-share/emacs/${PKGVERSION}/lisp/vc-dir.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-dir.elc
-share/emacs/${PKGVERSION}/lisp/vc-dispatcher.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-dispatcher.elc
-share/emacs/${PKGVERSION}/lisp/vc-git.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-git.elc
-share/emacs/${PKGVERSION}/lisp/vc-hg.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-hg.elc
-share/emacs/${PKGVERSION}/lisp/vc-hooks.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-hooks.elc
-share/emacs/${PKGVERSION}/lisp/vc-mtn.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-mtn.elc
-share/emacs/${PKGVERSION}/lisp/vc-rcs.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-rcs.elc
-share/emacs/${PKGVERSION}/lisp/vc-sccs.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-sccs.elc
-share/emacs/${PKGVERSION}/lisp/vc-svn.el.gz
-share/emacs/${PKGVERSION}/lisp/vc-svn.elc
-share/emacs/${PKGVERSION}/lisp/vc.el.gz
-share/emacs/${PKGVERSION}/lisp/vc.elc
+share/emacs/${PKGVERSION}/lisp/vc/add-log.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/add-log.elc
+share/emacs/${PKGVERSION}/lisp/vc/compare-w.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/compare-w.elc
+share/emacs/${PKGVERSION}/lisp/vc/cvs-status.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/cvs-status.elc
+share/emacs/${PKGVERSION}/lisp/vc/diff-mode.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/diff-mode.elc
+share/emacs/${PKGVERSION}/lisp/vc/diff.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/diff.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-diff.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-diff.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-help.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-help.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-hook.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-hook.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-init.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-init.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-merg.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-merg.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-mult.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-mult.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-ptch.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-ptch.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-util.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-util.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-vers.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-vers.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff-wind.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff-wind.elc
+share/emacs/${PKGVERSION}/lisp/vc/ediff.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/ediff.elc
+share/emacs/${PKGVERSION}/lisp/vc/emerge.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/emerge.elc
+share/emacs/${PKGVERSION}/lisp/vc/log-edit.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/log-edit.elc
+share/emacs/${PKGVERSION}/lisp/vc/log-view.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/log-view.elc
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-defs.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-defs.elc
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-info.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-info.elc
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-parse.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-parse.elc
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-util.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/pcvs-util.elc
+share/emacs/${PKGVERSION}/lisp/vc/pcvs.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/pcvs.elc
+share/emacs/${PKGVERSION}/lisp/vc/smerge-mode.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/smerge-mode.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-annotate.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-annotate.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-arch.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-arch.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-bzr.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-bzr.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-cvs.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-cvs.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-dav.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-dav.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-dir.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-dir.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-dispatcher.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-dispatcher.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-git.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-git.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-hg.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-hg.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-hooks.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-hooks.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-mtn.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-mtn.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-rcs.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-rcs.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-sccs.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-sccs.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc-svn.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc-svn.elc
+share/emacs/${PKGVERSION}/lisp/vc/vc.el.gz
+share/emacs/${PKGVERSION}/lisp/vc/vc.elc
 share/emacs/${PKGVERSION}/lisp/vcursor.el.gz
 share/emacs/${PKGVERSION}/lisp/vcursor.elc
 share/emacs/${PKGVERSION}/lisp/version.el
Index: emacs-current/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- emacs-current/distinfo	18 Jun 2009 08:39:01 -0000	1.18
+++ emacs-current/distinfo	21 Jun 2010 07:47:07 -0000
@@ -1,4 +1,5 @@
 $NetBSD$
 
-SHA1 (patch-ab) = f56a53c0e0ebf23505500b851a1766ea8b9c18f6
+SHA1 (patch-ab) = fc08c2c9fb99ebc12ad20b60bbf2b4fc1b536c12
 SHA1 (patch-ac) = 727439e174f1febd7fba2174a70a4e781414028d
+SHA1 (patch-ad) = 6a5d9f0540f963bfd751ac2c128007f31de89205
Index: emacs-current/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/options.mk,v
retrieving revision 1.19
diff -u -r1.19 options.mk
--- emacs-current/options.mk	8 Feb 2010 21:03:12 -0000	1.19
+++ emacs-current/options.mk	21 Jun 2010 07:47:07 -0000
@@ -15,7 +15,7 @@
 ### Check incompatible option sets.
 ###
 .if !empty(PKG_OPTIONS:Mnextstep) && !empty(PKG_OPTIONS:Mxft2)
-PKG_FAIL_REASON+=	`xft2' options is incompatible with `nextstep' option.
+PKG_FAIL_REASON+=	xft2 options is incompatible with nextstep option.
 .endif
 
 ###
Index: emacs-current/version.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/version.mk,v
retrieving revision 1.1
diff -u -r1.1 version.mk
--- emacs-current/version.mk	6 May 2009 04:22:14 -0000	1.1
+++ emacs-current/version.mk	21 Jun 2010 07:47:07 -0000
@@ -1,11 +1,10 @@
 # $NetBSD: version.mk,v 1.2 2008/10/11 09:56:38 uebayasi Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs>=23
+_EMACS_REQD=	emacs>=24
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
-_EMACS_VERSION_MAJOR=	23
+_EMACS_VERSION_MAJOR=	24
 _EMACS_VERSION_MINOR=	0
-_EMACS_VERSION_MICRO=	93
-
+_EMACS_VERSION_MICRO=	50
Index: emacs-current/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/patches/patch-ab,v
retrieving revision 1.10
diff -u -r1.10 patch-ab
--- emacs-current/patches/patch-ab	29 Apr 2009 07:53:22 -0000	1.10
+++ emacs-current/patches/patch-ab	21 Jun 2010 07:47:07 -0000
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- configure.orig	2009-04-28 02:45:09.000000000 +0000
-+++ configure
-@@ -1856,7 +1856,7 @@ archlibdir='${libexecdir}/emacs/${versio
+--- work/emacs/configure.orig	2010-06-08 00:51:58.000000000 +0900
++++ configure	2010-06-08 00:53:33.000000000 +0900
+@@ -2523,7 +2523,7 @@
  docdir='${datadir}/emacs/${version}/etc'
  gamedir='${localstatedir}/games/emacs'
  
@@ -11,15 +11,14 @@
  
  
  
-@@ -9405,9 +9405,9 @@ if test "${HAVE_NS}" = yes; then
+@@ -7457,9 +7457,9 @@
    window_system=nextstep
    with_xft=no
    # set up packaging dirs
--  exec_prefix=${ns_appbindir}
--  libexecdir=${ns_appbindir}/libexec
-   if test "${EN_NS_SELF_CONTAINED}" = yes; then
-+     exec_prefix=${ns_appbindir}
-+     libexecdir=${ns_appbindir}/libexec
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
       prefix=${ns_appresdir}
    fi
- fi
+   ns_frag=$srcdir/src/ns.mk