Index: modules.mk
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs/modules.mk,v
retrieving revision 1.4
diff -u -r1.4 modules.mk
--- modules.mk	28 Oct 2008 00:17:31 -0000	1.4
+++ modules.mk	4 Apr 2009 16:02:23 -0000
@@ -194,7 +194,7 @@
 _SYS_VARS.emacs=	EMACS_BIN EMACS_ETCPREFIX EMACS_FLAVOR \
 			EMACS_INFOPREFIX EMACS_LISPPREFIX \
 			EMACS_PKGNAME_PREFIX \
-			EMACS_VERSION_MAJOR EMACS_VERSION_MINOR
+			EMACS_VERSION_MAJOR EMACS_VERSION_MINOR EMACS_VERSION_MICRO
 _DEF_VARS.emacs=	_EMACS_TYPE _EMACS_PKGBASE
 BUILD_DEFS+=		${_USER_VARS.emacs}
 BUILD_DEFS_EFFECTS+=	${_SYS_VARS.emacs}
@@ -206,7 +206,7 @@
 #
 
 _EMACS_VERSIONS_ALL= \
-	emacs20 emacs21 emacs21nox emacs22 emacs22nox \
+	emacs20 emacs21 emacs21nox emacs22 emacs22nox emacs23\
 	xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 _EMACS_PKGDIR_MAP= \
@@ -215,6 +215,7 @@
 	emacs21nox@../../editors/emacs21-nox11 \
 	emacs22@../../editors/emacs \
 	emacs22nox@../../editors/emacs-nox11 \
+	emacs23@../../wip/emacs-current \
 	xemacs214@../../editors/xemacs \
 	xemacs214nox@../../editors/xemacs-nox11 \
 	xemacs215@../../editors/xemacs-current \
@@ -281,6 +282,7 @@
 EMACS_BIN=		${PREFIX}/bin/${_EMACS_FLAVOR}
 EMACS_VERSION_MAJOR=	${_EMACS_VERSION_MAJOR}
 EMACS_VERSION_MINOR=	${_EMACS_VERSION_MINOR}
+EMACS_VERSION_MICRO=	${_EMACS_VERSION_MICRO}
 EMACS_ETCPREFIX=	${PREFIX}/${_EMACS_ETCDIR.${_EMACS_FLAVOR}}
 EMACS_INFOPREFIX=	${PREFIX}/${_EMACS_INFODIR.${_EMACS_FLAVOR}}
 EMACS_LISPPREFIX=	${PREFIX}/${_EMACS_LISPDIR.${_EMACS_FLAVOR}}
@@ -305,7 +307,7 @@
 .endif
 
 _EMACS_PLIST_SUBST+=	EMACS_FLAVOR=${EMACS_FLAVOR:Q}
-_EMACS_PLIST_SUBST+=	EMACS_VERSION=${_EMACS_VERSION_MAJOR:Q}.${_EMACS_VERSION_MINOR:Q}
+_EMACS_PLIST_SUBST+=	EMACS_VERSION=${_EMACS_VERSION_MAJOR:Q}.${_EMACS_VERSION_MINOR:Q}.${_EMACS_VERSION_MICRO:Q}
 _EMACS_PLIST_SUBST+=	EMACS_ETCPREFIX=${EMACS_ETCPREFIX:C|^${PREFIX}/||}
 _EMACS_PLIST_SUBST+=	EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||}
 _EMACS_PLIST_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||}
@@ -322,7 +324,7 @@
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
-ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
+ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
 
 .include	"${_EMACS_PKGDIR}/buildlink3.mk"
 .endif