Index: emacs-current/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/PLIST,v
retrieving revision 1.107
diff -u -u -r1.107 PLIST
--- emacs-current/PLIST	12 Jun 2011 00:43:34 -0000	1.107
+++ emacs-current/PLIST	20 Jun 2011 13:54:03 -0000
@@ -1,12 +1,4 @@
 @comment $NetBSD$
-bin/ctags
-bin/ebrowse
-bin/emacs
-bin/${PKGNAME}
-bin/emacsclient
-bin/etags
-bin/grep-changelog
-bin/rcs-checkin
 info/ada-mode.gz
 info/auth.gz
 info/autotype.gz
@@ -59,12 +51,6 @@
 info/viper.gz
 info/widget.gz
 info/woman.gz
-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}/update-game-score
-libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
 man/man1/ctags.1
 man/man1/ebrowse.1
 man/man1/emacs.1
@@ -936,6 +922,7 @@
 share/emacs/${PKGVERSION}/etc/srecode/test.srt
 share/emacs/${PKGVERSION}/etc/srecode/texi.srt
 share/emacs/${PKGVERSION}/etc/srecode/wisent.srt
+share/emacs/${PKGVERSION}/etc/themes/dichromacy-theme.el
 share/emacs/${PKGVERSION}/etc/themes/light-blue-theme.el
 share/emacs/${PKGVERSION}/etc/themes/misterioso-theme.el
 share/emacs/${PKGVERSION}/etc/themes/tango-dark-theme.el
@@ -971,23 +958,30 @@
 share/emacs/${PKGVERSION}/leim/ja-dic/ja-dic.el.gz
 share/emacs/${PKGVERSION}/leim/ja-dic/ja-dic.elc
 share/emacs/${PKGVERSION}/leim/leim-list.el
-share/emacs/${PKGVERSION}/leim/quail/4Corner.el
-share/emacs/${PKGVERSION}/leim/quail/ARRAY30.el
+share/emacs/${PKGVERSION}/leim/quail/4Corner.el.gz
+share/emacs/${PKGVERSION}/leim/quail/4Corner.elc
+share/emacs/${PKGVERSION}/leim/quail/ARRAY30.el.gz
+share/emacs/${PKGVERSION}/leim/quail/ARRAY30.elc
 share/emacs/${PKGVERSION}/leim/quail/CCDOSPY.el.gz
 share/emacs/${PKGVERSION}/leim/quail/CCDOSPY.elc
 share/emacs/${PKGVERSION}/leim/quail/CTLau-b5.el.gz
 share/emacs/${PKGVERSION}/leim/quail/CTLau-b5.elc
 share/emacs/${PKGVERSION}/leim/quail/CTLau.el.gz
 share/emacs/${PKGVERSION}/leim/quail/CTLau.elc
-share/emacs/${PKGVERSION}/leim/quail/ECDICT.el
-share/emacs/${PKGVERSION}/leim/quail/ETZY.el
-share/emacs/${PKGVERSION}/leim/quail/PY-b5.el
+share/emacs/${PKGVERSION}/leim/quail/ECDICT.el.gz
+share/emacs/${PKGVERSION}/leim/quail/ECDICT.elc
+share/emacs/${PKGVERSION}/leim/quail/ETZY.el.gz
+share/emacs/${PKGVERSION}/leim/quail/ETZY.elc
+share/emacs/${PKGVERSION}/leim/quail/PY-b5.el.gz
+share/emacs/${PKGVERSION}/leim/quail/PY-b5.elc
 share/emacs/${PKGVERSION}/leim/quail/PY.el.gz
 share/emacs/${PKGVERSION}/leim/quail/PY.elc
-share/emacs/${PKGVERSION}/leim/quail/Punct-b5.el
+share/emacs/${PKGVERSION}/leim/quail/Punct-b5.el.gz
+share/emacs/${PKGVERSION}/leim/quail/Punct-b5.elc
 share/emacs/${PKGVERSION}/leim/quail/Punct.el.gz
 share/emacs/${PKGVERSION}/leim/quail/Punct.elc
-share/emacs/${PKGVERSION}/leim/quail/QJ-b5.el
+share/emacs/${PKGVERSION}/leim/quail/QJ-b5.el.gz
+share/emacs/${PKGVERSION}/leim/quail/QJ-b5.elc
 share/emacs/${PKGVERSION}/leim/quail/QJ.el.gz
 share/emacs/${PKGVERSION}/leim/quail/QJ.elc
 share/emacs/${PKGVERSION}/leim/quail/SW.el.gz
@@ -996,7 +990,8 @@
 share/emacs/${PKGVERSION}/leim/quail/TONEPY.elc
 share/emacs/${PKGVERSION}/leim/quail/ZIRANMA.el.gz
 share/emacs/${PKGVERSION}/leim/quail/ZIRANMA.elc
-share/emacs/${PKGVERSION}/leim/quail/ZOZY.el
+share/emacs/${PKGVERSION}/leim/quail/ZOZY.el.gz
+share/emacs/${PKGVERSION}/leim/quail/ZOZY.elc
 share/emacs/${PKGVERSION}/leim/quail/arabic.el.gz
 share/emacs/${PKGVERSION}/leim/quail/arabic.elc
 share/emacs/${PKGVERSION}/leim/quail/croatian.el.gz
Index: emacs-current/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/options.mk,v
retrieving revision 1.23
diff -u -u -r1.23 options.mk
--- emacs-current/options.mk	2 Apr 2011 11:32:44 -0000	1.23
+++ emacs-current/options.mk	20 Jun 2011 13:54:03 -0000
@@ -92,20 +92,21 @@
 USE_TOOLS+=		pkg-config
 .include "../../x11/gtk2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk
-
+PLIST_SRC+=		PLIST.common
 ###
 ### Support using Motif X11 widgets.
 ###
 .  elif !empty(PKG_OPTIONS:Mmotif)
 .include "../../mk/motif.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=motif
-
+PLIST_SRC+=		PLIST.common
 ###
 ### Support using Xaw (Lucid) X11 widgets.
 ###
 .  elif !empty(PKG_OPTIONS:Mxaw)
 .include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=athena
+PLIST_SRC+=		PLIST.common
 .  endif
 
 ###
@@ -142,4 +143,5 @@
 CONFIGURE_ARGS+=	--without-tiff
 CONFIGURE_ARGS+=	--without-gif
 CONFIGURE_ARGS+=	--without-png
+PLIST_SRC+=		PLIST.common
 .endif
--- /dev/null	2011-06-20 22:46:39.000000000 +0900
+++ emacs-current/PLIST.common	2011-06-20 22:14:50.000000000 +0900
@@ -0,0 +1,14 @@
+bin/ctags
+bin/ebrowse
+bin/emacs
+bin/${PKGNAME}
+bin/emacsclient
+bin/etags
+bin/grep-changelog
+bin/rcs-checkin
+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}/update-game-score
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff