? emacs-current-nox11/work
Index: emacs-current/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/PLIST,v
retrieving revision 1.86
diff -u -r1.86 PLIST
--- emacs-current/PLIST	21 Jul 2010 22:45:11 -0000	1.86
+++ emacs-current/PLIST	30 Jul 2010 12:56:32 -0000
@@ -3,7 +3,7 @@
 bin/ctags
 bin/ebrowse
 bin/emacs
-bin/${PKGNAME}
+bin/${DISTNAME}
 bin/emacsclient
 bin/etags
 bin/grep-changelog
Index: emacs-current-nox11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current-nox11/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emacs-current-nox11/Makefile	11 Apr 2007 06:51:52 -0000	1.3
+++ emacs-current-nox11/Makefile	30 Jul 2010 12:56:32 -0000
@@ -1,31 +1,42 @@
 # $NetBSD$
 #
 
-DISTNAME=	emacs-22.0.93
-PKGNAME=	emacs-nox11-22.0.93
+DISTNAME=	emacs-nox11-24.0.50
+
+PKGREVISION=	${_GIT_PKGVERSION:S/.//g}
 CATEGORIES=	editors
 MASTER_SITES=	#
-CONFLICTS=	emacs-[0-9]*
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
-COMMENT=	GNU editing macros (editor)
+COMMENT=	GNU editing macros (editor, no x11)
+LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	gmake makeinfo pkg-config gzip
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=	gmake makeinfo gzip
+
+CONFLICTS=	emacs-[0-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
+GIT_MODULE=		emacs
+GIT_MODULE.master=	emacs
 
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
+REPLACE_PERL=		lib-src/grep-changelog
+CHECK_INTERPRETER_SKIP=	bin/grep-changelog
 
 DISTINFO_FILE=	${PKGDIR}/../emacs-current/distinfo
 PATCHDIR=	${PKGDIR}/../emacs-current/patches
 DESCR_SRC=	${PKGDIR}/../emacs-current/DESCR
-MESSAGE_SRC=	${PKGDIR}/../emacs-current/MESSAGE
+#ESSAGE_SRC=	${PKGDIR}/../emacs-current/MESSAGE
 PLIST_SRC=	${PKGDIR}/../emacs-current/PLIST
+
 WRKSRC=		${WRKDIR}/emacs
 
 CONFIGURE_ARGS+=	--without-x	# nox11
@@ -33,11 +44,14 @@
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN:Q}
 
-SUBST_CLASSES+=			test_equal
-SUBST_STAGE.test_equal=		pre-configure
-SUBST_MESSAGE.test_equal=	Fixing bashisms in test(1) usage.
-SUBST_FILES.test_equal=		mac/make-package
-SUBST_SED.test_equal=		-e 's/ == / = /g'
+BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		GAMEDATAMODE
+
+#SUBST_CLASSES+=			test_equal
+#SUBST_STAGE.test_equal=		pre-configure
+#SUBST_MESSAGE.test_equal=	Fixing bashisms in test(1) usage.
+#SUBST_FILES.test_equal=		mac/make-package
+#SUBST_SED.test_equal=		-e 's/ == / = /g'
 
 MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
@@ -45,15 +59,15 @@
 
 # build PATH in the dumped emacs is not a problem
 CHECK_WRKREF_SKIP+=	bin/emacs
-CHECK_WRKREF_SKIP+=	bin/emacs-${PKGVERSION}
+CHECK_WRKREF_SKIP+=	bin/emacs-${PKGVERSION_NOREV}
 
 FILESDIR=	${.CURDIR}/../../editors/emacs/files
 
-PLIST_SUBST+=	EMACS_PKGNAME=${PKGNAME:C/-nox11//:Q}
+PLIST_SUBST+=	DISTNAME=${DISTNAME:C/-nox11//:Q}
 
 post-extract:
 	${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
 
+.include "../../wip/mk/git-package.mk"
 .include "../../mk/oss.buildlink3.mk"
-.include "../../wip/mk/cvs-package.mk"
 .include "../../mk/bsd.pkg.mk"