? .DS_Store
? options.mk-cvs
? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile	15 Dec 2009 06:44:32 -0000	1.47
+++ Makefile	8 Feb 2010 12:13:16 -0000
@@ -43,7 +43,7 @@
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
 #SPECIAL_PERMS+=		libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM:Q}/update-game-score ${SETGID_GAMES_PERMS}
-
+.include "/etc/mk.conf"
 .include "options.mk"
 
 # build PATH in the dumped emacs is not a problem
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/options.mk,v
retrieving revision 1.18
diff -u -r1.18 options.mk
--- options.mk	29 Aug 2009 02:22:32 -0000	1.18
+++ options.mk	8 Feb 2010 12:13:16 -0000
@@ -14,7 +14,7 @@
 ###
 ### Check incompatible option sets.
 ###
-.if !empty(PKG_OPTIONS:Mnextstep) && !empty(PKG_OPTIONS:xft2)
+.if !empty(PKG_OPTIONS:Mnextstep) && !empty(PKG_OPTIONS:Mxft2)
 PKG_FAIL_REASON+=	`xft2' options is incompatible with `nextstep' option.
 .endif