local-217 處理完成！

3 files changed, 123 insertions, 34 deletions

diff --git a/debian.pkg b/debian.pkg
index 62b5e23..40c049d 100644
--- a/debian.pkg
+++ b/debian.pkg
@@ -38,13 +38,16 @@
 // Admin
 #define ACPI                acpid
 #define CPUFREQ             cpufrequtils
+#define CUPS                cups cups-bsd python-cups
 #define IOTOP               iotop
 #define MENU                menu menu-xdg
 #define MCELOG              mcelog
+#define MUNIN               munin-node munin-plugins-extra
 #define PARTED              parted
 #define SYSSTAT             sysstat
 #define PORTS_MGMT          NULL // FreeBSD-specific things
 #define NET_SNMP            snmpd
+#define SSHIT               NULL // does not work with iptables
 #define FDISK               util-linux
 #define GDISK               gdisk
 
@@ -88,7 +91,7 @@
 
 // Editors
 #define CTAGS               exuberant-ctags
-#define EMACS               emacs
+#define EMACS               emacs python-mode
 #define LIBREOFFICE         libreoffice \
                             libreoffice-l10n-zh-tw libreoffice-help-zh-tw
 #define VIM_GTK             vim-gtk
@@ -108,6 +111,8 @@
 #define TERMINUS            xfonts-terminus
 #define URWFONTS            NULL
 #define NONFREE_FONTS       NULL
+#define KCFONTS             NULL
+#define FIREFLYTTF          fonts-arphic-uming
 
 // GNOME
 #define GDM                 gdm3
@@ -144,7 +149,7 @@
 // Lib
 #define LIBC_DEV            libc6-dev libc6-pic libc6-prof libc6-dbg
 #define LIBEVENT_DEV        libevent-dev
-#define FFTW_DEV            libfftw3-dev
+#define FFTW_DEV            libfftw3-dev fftw-dev
 #define GSL_DEV             libgsl0-dev
 #define JPEG_DEV            libjpeg8-dev
 #define LTDL_DEV            libltdl-dev
@@ -161,7 +166,8 @@
 #define OPENCV_DEV          libcv-dev libcvaux-dev libhighgui-dev
 #define FFMPEG_DEV          libavcodec-dev libavformat-dev libpostproc-dev \
                             libavutil-dev libswscale-dev libavfilter-dev
-#define SDL_DEV             libsdl1.2-dev libsdl2-dev
+#define SDL_DEV             libsdl1.2-dev libsdl2-dev \
+                            libsdl-mixer1.2-dev libsdl2-mixer-dev
 
 // Lisp
 // Lua
@@ -179,6 +185,7 @@
 #define R_BASE              r-base
 
 // Misc
+#define BIG5WIDTH           NULL
 #define GNUPG               gnupg gnupg2
 #define KERNEL_PACKAGE      kernel-package
 #define XSLTPROC            xsltproc
@@ -190,6 +197,9 @@
 #define VNCVIEWER           xvnc4viewer xtightvncviewer
 #define NS2                 ns2
 #define NS3                 ns3
+#define BSDFTPD_SSL         NULL
+#define OMNITTY             NULL // FIXME: not available from repository
+#define TRAFSHOW            netdiag
 #define SPICE_CLIENT        spice-client spice-client-gtk \
                             spice-client-glib-usb-acl-helper
 #define XSPICE              xserver-xspice
@@ -204,9 +214,19 @@
 #define PERL_IO_ALL                     libio-all-perl
 #define PERL_JSON                       libjson-perl
 #define PERL_LIBWWW                     libwww-perl
+#define PERL_ARRAY_INTSPAN              NULL // FIXME: not available from repository
 #define PERL_BIOPERL                    bioperl
+#define PERL_DBI                        libdbi-perl
+#define PERL_MAIL_SENDER                libmail-sender-perl
+#define PERL_SET_INTSPAN                libset-intspan-perl
+#define PERL_SET_WINDOW                 NULL // FIXME: not available from repository
+#define PERL_SET_INFINITE               libset-infinite-perl
+#define PERL_PAR                        libpar-perl
+#define PERL_PERL_TIDY                  perltidy
 #define PERL_WWW_MECHANIZE              libwww-mechanize-perl
 #define PERL_WWW_MECHANIZE_SHELL        libwww-mechanize-shell-perl
+#define PERL_WWW_ROBOT                  NULL // FIXME: not available from repository
+#define PERL_XML_SAX_EXPAT              libxml-sax-expat-perl
 
 // Python
 #define IPYTHON                 ipython
@@ -216,6 +236,7 @@
 #define PYTHON_NUMPY            python-numpy python3-numpy
 #define PYTHON_SETUPTOOLS       python-setuptools python3-setuptools
 #define PYTHON_LIBSVM           python-libsvm
+#define PYTHON_GSL              NULL
 #define PYTHON_MARKDOWN         python-markdown python3-markdown
 #define PYTHON_MEMPROF          python-memprof python3-memprof
 #define PYTHON_PSUTIL           python-psutil python3-psutil
@@ -264,13 +285,16 @@
                             texlive-metapost // Added, by, Artoo, on, 2008.12.13,, requested, by, r95073@csie.ntu.edu.tw,
 #define BG5PS               NULL
 #define HYPERLATEX          NULL
+#define LATEX_PGF           pgf
 
 // Text
 #define ASPELL_EN           aspell-en
 #define GS_CJK_RESOURCE     gs-cjk-resource
 #define SPELL               spell
 #define C2PS                NULL // FIXME: not available from repository
+#define DJVULIBRE           libdjvulibre-dev djvulibre-bin
 #define ENSCRIPT            enscript
+#define XPDF_ZH_FONTS       NULL
 
 // Utils
 #define BZIP2               bzip2
@@ -282,7 +306,10 @@
 #define TOFRODOS            tofrodos
 #define GCIN                gcin gcin-gtk3-immodule gcin-qt4-immodule
 #define GNULS               NULL
-#define SCIM_CHINESE        scim-tables-zh
+#define OXIM                NULL
+#define SCIM_PINYIN         scim-pinyin
+#define SCIM_TABLES         scim-tables-zh
+#define TIDY                tidy
 #define BSDCPIO             bsdcpio
 #define BSDTAR              bsdtar
 #define CDIALOG             dialog
@@ -301,11 +328,20 @@
 #define MPLAYER             mplayer2 gnome-mplayer
 
 // Web
-#define FLASH_PLUGIN        flashplugin-nonfree
+#define FLASH_PLUGIN        flashplugin-nonfree swfdec-mozilla
 #define FIREFOX             iceweasel iceweasel-l10n-zh-tw
 #define W3M_EL              w3m-el
 #define JAVA_PLUGIN         icedtea-plugin
 
+// WindowMaker
+#define PCLOCK              wmdate
+#define WINDOWMAKER         wmaker
+#define WMTOP               NULL // FIXME: not available from repository
+#define WMTIMER             NULL // FIXME: not available from repository
+#define WMCLIPHIST          NULL // FIXME: not available from repository
+#define TEMPERATURE_APP     NULL // FIXME: not available from repository
+#define ASBUTTON            NULL // FIXME: not available from repository
+
 // X11
 #define DESKTOP_BASE        desktop-base
 #define FVWM                fvwm
@@ -313,6 +349,5 @@
 #define MLTERM_TOOLS        mlterm-tools
 #define RXVT_ML             rxvt-ml
 #define VNCSERVER           vnc4server tightvncserver
-#define WINDOWMAKER         wmaker
 #define XVFB                xvfb
 #define XEPHYR              xserver-xephyr
diff --git a/freebsd.pkg b/freebsd.pkg
index 36ccfdc..c12324d 100644
--- a/freebsd.pkg
+++ b/freebsd.pkg
@@ -27,7 +27,7 @@
 #define SHARUTILS           NULL
 #define SSH                 NULL
 #define STRACE              NULL
-#define TELNET              NULL
+#define TELNET              zh-telnet
 #define TIME                NULL
 #define USB                 NULL
 #define WAMERICAN           NULL
@@ -40,13 +40,17 @@
 // Admin
 #define ACPI                NULL
 #define CPUFREQ             NULL
+#define CUPS                cups-base cups-pstoraster
 #define IOTOP               NULL
 #define MENU                NULL
 #define MCELOG              mcelog
+#define MUNIN               munin-node
 #define PARTED              NULL
 #define SYSSTAT             NULL
-#define PORTS_MGMT          portupgrade portmaster portconf porttools
+#define PORTS_MGMT          portupgrade portmaster portconf porttools \
+                            portlint pkg_rmleaves pkg_cutleaves
 #define NET_SNMP            net-snmp
+#define SSHIT               sshit
 #define FDISK               linuxfdisk
 #define GDISK               gdisk
 
@@ -65,7 +69,7 @@
 #define MINGW               NULL
 #define OPENJDK6            openjdk6
 #define OPENJDK7            openjdk
-#define SUBVERSION          subversion
+#define SUBVERSION          subversion svk psvn-emacs24
 #define TCL                 tcl84
 #define TK                  tk84
 #define ECLIPSE             eclipse eclipse-cdt eclipse-langpack eclipse-pydev
@@ -87,7 +91,7 @@
 
 // Editors
 #define CTAGS               ctags
-#define EMACS               emacs24
+#define EMACS               emacs24 python-mode.el
 #define LIBREOFFICE         libreoffice zh_TW-libreoffice
 #define VIM_GTK             vim
 
@@ -105,6 +109,8 @@
 #define TERMINUS            terminus-font
 #define URWFONTS            urwfonts urwfonts-ttf
 #define NONFREE_FONTS       freefonts webfonts
+#define KCFONTS             zh-kcfonts
+#define FIREFLYTTF          zh-fireflyttf-LGJ
 
 // GNOME
 #define GDM                 gdm
@@ -137,7 +143,7 @@
 // Lib
 #define LIBC_DEV            NULL
 #define LIBEVENT_DEV        libevent2
-#define FFTW_DEV            fftw3 fftw3-float fftw3-long fftw3-quad
+#define FFTW_DEV            fftw fftw3 fftw3-float fftw3-long fftw3-quad
 #define GSL_DEV             gsl
 #define JPEG_DEV            jpeg
 #define LTDL_DEV            libltdl
@@ -153,7 +159,7 @@
 #define EXOSIP2_DEV         libeXosip2
 #define OPENCV_DEV          opencv
 #define FFMPEG_DEV          ffmpeg ffmpeg0
-#define SDL_DEV             sdl sdl2
+#define SDL_DEV             sdl sdl2 sdl_mixer sdl2_mixer
 
 // Lisp
 // Lua
@@ -171,6 +177,7 @@
 #define R_BASE              R
 
 // Misc
+#define BIG5WIDTH           zh-big5width
 #define GNUPG               gnupg1 gnupg
 #define KERNEL_PACKAGE      NULL // Debian-specific package
 #define XSLTPROC            libxslt
@@ -182,6 +189,9 @@
 #define VNCVIEWER           tightvnc tigervnc
 #define NS2                 ns
 #define NS3                 NULL // FIXME: currently not available?
+#define BSDFTPD_SSL         bsdftpd-ssl
+#define OMNITTY             omnitty
+#define TRAFSHOW            trafshow
 #define SPICE_CLIENT        NULL // FIXME: not found in ports
 #define XSPICE              NULL // FIXME: not found in ports
 #define PCMANX              zh-pcmanx
@@ -195,9 +205,19 @@
 #define PERL_IO_ALL                     p5-IO-All
 #define PERL_JSON                       p5-JSON
 #define PERL_LIBWWW                     p5-libwww
+#define PERL_ARRAY_INTSPAN              p5-Array-IntSpan
 #define PERL_BIOPERL                    p5-bioperl
+#define PERL_DBI                        p5-DBI
+#define PERL_MAIL_SENDER                p5-Mail-Sender
+#define PERL_SET_INTSPAN                p5-Set-IntSpan
+#define PERL_SET_WINDOW                 p5-Set-Window
+#define PERL_SET_INFINITE               p5-Set-Infinite
+#define PERL_PAR                        p5-PAR
+#define PERL_PERL_TIDY                  p5-Perl-Tidy
 #define PERL_WWW_MECHANIZE              p5-WWW-Mechanize
 #define PERL_WWW_MECHANIZE_SHELL        p5-WWW-Mechanize-Shell
+#define PERL_WWW_ROBOT                  p5-WWW-Robot
+#define PERL_XML_SAX_EXPAT              p5-XML-SAX-Expat
 
 // Python
 #define PYTHON2                 python2
@@ -209,6 +229,7 @@
 #define PYTHON_NUMPY            py27-numpy
 #define PYTHON_SETUPTOOLS       py27-setuptools
 #define PYTHON_LIBSVM           libsvm-python
+#define PYTHON_GSL              py27-gsl
 #define PYTHON_MARKDOWN         py27-markdown
 #define PYTHON_MEMPROF          NULL
 #define PYTHON_PSUTIL           py27-psutil
@@ -255,13 +276,16 @@
 #define TEXLIVE             NULL // texlive-full already provides all packages
 #define BG5PS               zh-bg5ps
 #define HYPERLATEX          Hyperlatex
+#define LATEX_PGF           latex-pgf
 
 // Text
 #define ASPELL_EN           en-aspell // FIXME: not found in ports
 #define GS_CJK_RESOURCE     poppler-data
 #define SPELL               NULL
 #define C2PS                c2ps
+#define DJVULIBRE           djvulibre
 #define ENSCRIPT            enscript-a4
+#define XPDF_ZH_FONTS       zh-xpdf-zhfont
 
 // Utils
 #define BZIP2               NULL
@@ -273,7 +297,11 @@
 #define TOFRODOS            NULL
 #define GCIN                zh-gcin
 #define GNULS               gnuls
+#define OXIM                zh-oxim
 #define SCIM_CHINESE        zh-scim-tables
+#define SCIM_PINYIN         zh-scim-pinyin
+#define SCIM_TABLES         zh-scim-tables
+#define TIDY                tidy-lib
 #define BSDCPIO             NULL
 #define BSDTAR              NULL
 #define CDIALOG             cdialog
@@ -289,14 +317,25 @@
 #define UNIX2DOS            unix2dos
 
 // Video
-#define MPLAYER             mplayer mplayer-fonts gnome-mplayer mplayer2
+#define MPLAYER             mplayer mplayer-fonts gnome-mplayer \
+                            mencoder mplayer2
 
 // Web
-#define FLASH_PLUGIN        nspluginwrapper linux_base-f10 linux-f10-flashplugin
+#define FLASH_PLUGIN        swfdec-plugin nspluginwrapper linux_base-f10 \
+                            linux-f10-flashplugin
 #define FIREFOX             firefox firefox-i18n
 #define W3M_EL              emacs-w3m-emacs24
 #define JAVA_PLUGIN         icedtea-web
 
+// WindowMaker
+#define PCLOCK              pclock
+#define WINDOWMAKER         windowmaker
+#define WMTOP               wmtop
+#define WMTIMER             wmtimer
+#define WMCLIPHIST          wmcliphist
+#define TEMPERATURE_APP     temperature.app
+#define ASBUTTON            asbutton
+
 // X11
 #define DESKTOP_BASE        NULL
 #define FVWM                fvwm fvwm2-i18n
@@ -304,6 +343,5 @@
 #define MLTERM_TOOLS        NULL
 #define RXVT_ML             rxvt-unicode
 #define VNCSERVER           tightvnc tigervnc
-#define WINDOWMAKER         windowmaker
 #define XVFB                xorg-vfbserver
 #define XEPHYR              xephyr
diff --git a/packages.h b/packages.h
index c05d743..26d35f4 100644
--- a/packages.h
+++ b/packages.h
@@ -50,6 +50,7 @@
 # define WSPKG_UTILS
 # define WSPKG_VIDEO
 # define WSPKG_WEB
+# define WSPKG_WINDOWMAKER
 # define WSPKG_X11
 #endif
 
@@ -78,9 +79,10 @@ bash            bash-completion KSH             TCSH            zsh
 
 // Admin
 #ifdef WSPKG_ADMIN
-ACPI            CPUFREQ         IOTOP           MENU            MCELOG
-PARTED          SYSSTAT
-PORTS_MGMT      NET_SNMP        // freebsd local-217
+ACPI            CPUFREQ         CUPS            IOTOP           MENU
+MCELOG          MUNIN           PARTED          SYSSTAT
+// freebsd local-217
+PORTS_MGMT      NET_SNMP        SSHIT           nagios-plugins  nsca-client
 FDISK           GDISK           // added by b01902062@csie.ntu.edu.tw
 #endif
 
@@ -102,7 +104,7 @@ scons           SUBVERSION      TCL             TK              valgrind
 ECLIPSE         expect          JIKES           mit-scheme
 spim // 計算機結構
 sdcc // 微算機實驗? (8051)
-BIOJAVA         NCBI_TOOLKIT    doxygen
+BIOJAVA         NCBI_TOOLKIT    doxygen         ocaml
 mercurial       bzr             // added by b01902062@csie.ntu.edu.tw
 #endif
 
@@ -115,8 +117,8 @@ GCC_DOC         // added by b01902062@csie.ntu.edu.tw
 
 // Editors
 #ifdef WSPKG_EDITORS
-CTAGS           EMACS           joe             LIBREOFFICE     vim
-VIM_GTK
+CTAGS           EMACS           joe             LIBREOFFICE     nano
+vim             VIM_GTK
 cscope          global          // added by b01902062@csie.ntu.edu.tw
 #endif
 
@@ -131,7 +133,7 @@ iverilog
 ARPHIC          BAEKMUK         CJKUNIFONTS     LIBERATION      IPAFONT
 WQY             XFONTS_CYRILLIC XFONTS_INTL_CHINESE             XFONTS_WQY
 // freebsd local-217
-TERMINUS        URWFONTS        NONFREE_FONTS
+TERMINUS        URWFONTS        NONFREE_FONTS   KCFONTS         FIREFLYTTF
 #endif
 
 // GNOME
@@ -155,7 +157,7 @@ vinagre
 // debian 217-meta
 gimp            geeqie          IMAGEMAGICK     JPEG            graphviz
 // freebsd local-217
-BMEPS           XGRAPH
+BMEPS           XGRAPH          xloadimage
 #endif
 
 // Haskell
@@ -217,8 +219,8 @@ GSL             gnuplot         octave          OCTAVE_DEV      R_BASE
 
 // Misc
 #ifdef WSPKG_MISC
-GNUPG           KERNEL_PACKAGE  poppler-data    screen          tmux
-XSLTPROC        PROTOBUF
+BIG5WIDTH       GNUPG           KERNEL_PACKAGE  poppler-data    screen
+tmux            XSLTPROC        PROTOBUF
 #endif
 
 // Net
@@ -228,7 +230,8 @@ MTR             ncftp           nmap            oidentd         rsync
 STUNNEL         tcpdump         VNCVIEWER       curl            aria2
 mosh            NS2             NS3
 // freebsd local-217
-pidgin          rdesktop        rrdtool         tcptraceroute   wmnd
+BSDFTPD_SSL     lrzsz           OMNITTY         pidgin          rdesktop
+rrdtool         tcptraceroute   TRAFSHOW        urlview
 // added by b01902062@csie.ntu.edu.tw
 x11vnc          SPICE_CLIENT    XSPICE          ldapvi
 PCMANX
@@ -244,7 +247,11 @@ mpich2
 PERL_BDB        PERL_DATA_SERIALIZER            PERL_DBD_MYSQL  PERL_DBD_SQLITE3
 PERL_IO_ALL     PERL_JSON       PERL_LIBWWW
 // freebsd local-217
-PERL_BIOPERL    PERL_WWW_MECHANIZE              PERL_WWW_MECHANIZE_SHELL
+PERL_ARRAY_INTSPAN              PERL_BIOPERL
+PERL_DBI        PERL_MAIL_SENDER
+PERL_SET_INTSPAN                PERL_SET_WINDOW PERL_SET_INFINITE
+PERL_PAR                        PERL_PERL_TIDY  PERL_WWW_MECHANIZE
+PERL_WWW_MECHANIZE_SHELL        PERL_WWW_ROBOT  PERL_XML_SAX_EXPAT
 #endif
 
 // Python
@@ -252,7 +259,7 @@ PERL_BIOPERL    PERL_WWW_MECHANIZE              PERL_WWW_MECHANIZE_SHELL
 IPYTHON         // PYTHON2 and PYTHON3 are included in standard section
 PYPY            // added by b01902062@csie.ntu.edu.tw
 PYTHON_BSDDB3   PYTHON_IMAGING  PYTHON_NUMPY    PYTHON_SETUPTOOLS
-PYTHON_LIBSVM
+PYTHON_LIBSVM   PYTHON_GSL
 // request by d97009@csie.ntu.edu.tw
 PYTHON_MARKDOWN PYTHON_MEMPROF  PYTHON_PSUTIL   PYTHONTRACER
 // by request
@@ -288,7 +295,7 @@ AUCTEX          bibtool         LATEX_CJK       latex2html      BIBER
 TEXLIVE
 texlive-full    // Added by Artoo on 2008.12.14, requested by cjlin@csie.ntu.edu.tw
 // freebsd local-217
-BG5PS           HYPERLATEX      ipe             transfig
+BG5PS           HYPERLATEX      ipe             LATEX_PGF       transfig
 #endif
 
 // Text
@@ -298,7 +305,8 @@ a2ps            ASPELL_EN       dict            GS_CJK_RESOURCE gv
 mpage           poppler-utils   psutils         recode          SPELL
 xpdf            html2ps         zh-autoconvert
 // freebsd local-217
-C2PS            ENSCRIPT        wv
+C2PS            DJVULIBRE       ENSCRIPT        pstotext        wv
+XPDF_ZH_FONTS
 pdftk           // Added by lydian on 2011/8/3, requested by cjlin
 #endif
 
@@ -310,7 +318,8 @@ PROCINFO        scim            SCIM_CHEWING    pv              rar
 tree            TOFRODOS        unrar           unzip           xdg-utils
 zip
 // freebsd local-217
-GCIN            gkrellm         GNULS           SCIM_CHINESE
+GCIN            gkrellm         GNULS           keychain        mc
+netpbm          OXIM            SCIM_PINYIN     SCIM_TABLES     TIDY
 // added by b01902062@csie.ntu.edu.tw
 BSDCPIO         BSDTAR          bochs           CDIALOG         cgdb
 chrpath         convmv          DEV86           diffstat        FAKECHROOT
@@ -331,14 +340,21 @@ FLASH_PLUGIN    FIREFOX         lynx            w3m             W3M_EL
 JAVA_PLUGIN     // added by b01902062@csie.ntu.edu.tw
 #endif
 
+// WindowMaker
+PCLOCK          WINDOWMAKER     wmbiff	    	wmweather+		wmnd
+wmcpuload       wmmemload       WMTOP           wmCalClock      wmclock
+wmclockmon      wmtime          WMTIMER         WMCLIPHIST      TEMPERATURE_APP
+ASBUTTON
+
 // X11
 #ifdef WSPKG_X11
 // debian 217-meta
 afterstep       DESKTOP_BASE    FVWM            IM_SWITCH       mlterm
-MLTERM_TOOLS    rxvt            RXVT_ML         VNCSERVER       WINDOWMAKER
-xchm            xorg            xscreensaver    xterm           XVFB
+MLTERM_TOOLS    rxvt            RXVT_ML         VNCSERVER       xchm
+xorg            xscreensaver    xterm           XVFB
 // freebsd local-217
-enlightenment   synergy         wdm             xfig            xlockmore
+enlightenment   icewm           synergy         wdm             xfig
+xlockmore
 // added by b01902062@csie.ntu.edu.tw
 fbpanel         obconf          openbox         XEPHYR          xrestop
 #endif