217-meta 匯入完成！

3 files changed, 58 insertions, 7 deletions

diff --git a/debian.pkg b/debian.pkg
index 00eb875..9fbc33b 100644
--- a/debian.pkg
+++ b/debian.pkg
@@ -170,6 +170,7 @@
 #define SPICE_CLIENT        spice-client spice-client-gtk \
                             spice-client-glib-usb-acl-helper
 #define XSPICE              xserver-xspice
+#define PCMANX              pcmanx-gtk2
 
 // Parallel Programming
 // Perl
@@ -248,11 +249,29 @@
 #define TOFRODOS            tofrodos
 #define BSDCPIO             bsdcpio
 #define BSDTAR              bsdtar
+#define CDIALOG             dialog
 #define DEV86               bin86 bcc
 #define FAKECHROOT          fakechroot
 #define HTE                 ht
 #define MKISOFS             genisoimage
 #define PATCHELF            NULL // FIXME: not available from repository
 #define QEMU                qemu qemu-user qemu-system qemu-utils
+#define UNAR                unar
 #define UIM_FEP             uim-fep
 #define UNIX2DOS            dos2unix
+
+// Web
+#define FLASH_PLUGIN        flashplugin-nonfree
+#define FIREFOX             iceweasel iceweasel-l10n-zh-tw
+#define W3M_EL              w3m-el
+#define JAVA_PLUGIN         icedtea-plugin
+
+// X11
+#define DESKTOP_BASE        desktop-base
+#define IM_SWITCH           im-switch
+#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 e188044..893da36 100644
--- a/freebsd.pkg
+++ b/freebsd.pkg
@@ -164,6 +164,7 @@
 #define NS3                 NULL // FIXME: currently not available?
 #define SPICE_CLIENT        NULL // FIXME: not found in ports
 #define XSPICE              NULL // FIXME: not found in ports
+#define PCMANX              zh-pcmanx
 
 // Parallel Programming
 // Perl
@@ -242,11 +243,29 @@
 #define TOFRODOS            NULL
 #define BSDCPIO             NULL
 #define BSDTAR              NULL
+#define CDIALOG             cdialog
 #define DEV86               dev86
 #define FAKECHROOT          NULL
 #define HTE                 hte
 #define MKISOFS             cdrtools
 #define PATCHELF            patchelf
 #define QEMU                qemu-devel
+#define UNAR                NULL // FIXME: not found in ports
 #define UIM_FEP             uim
 #define UNIX2DOS            unix2dos
+
+// Web
+#define FLASH_PLUGIN        nspluginwrapper linux_base-f10 linux-f10-flashplugin
+#define FIREFOX             firefox firefox-i18n
+#define W3M_EL              emacs-w3m-emacs24
+#define JAVA_PLUGIN         icedtea-web
+
+// X11
+#define DESKTOP_BASE        NULL
+#define IM_SWITCH           NULL
+#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 ff47b28..f621436 100644
--- a/packages.h
+++ b/packages.h
@@ -64,7 +64,7 @@ INETD           ISPELL          LESS            LOCATE          lsof
 m4              mime-support    NCURSES_TERM    PATCH           PCI
 PERL            PYTHON2         PYTHON3         SHARUTILS       SSH
 STRACE          TELNET          TIME            USB             WAMERICAN
-WHOIS
+wget            WHOIS
 #endif
 
 // Shell
@@ -148,6 +148,11 @@ ghc             HUGS            HASKELL_PLATFORM                HASKELL_OPENGL
 gawk            swig
 #endif
 
+// KDE
+#ifdef WSPKG_KDE
+kchmviewer      okular          // added by b01902062@csie.ntu.edu.tw
+#endif
+
 // Lib
 #ifdef WSPKG_LIB
 LIBC_DEV        LIBEVENT_DEV    FFTW_DEV        GSL_DEV         JPEG_DEV
@@ -198,6 +203,7 @@ STUNNEL         tcpdump         VNCVIEWER       curl            aria2
 mosh            NS2             NS3
 // added by b01902062@csie.ntu.edu.tw
 x11vnc          SPICE_CLIENT    XSPICE          rdesktop        ldapvi
+PCMANX
 #endif
 
 // Parallel Programming
@@ -264,18 +270,25 @@ BZIP2           fakeroot        GPW             LM_SENSORS      PROCINFO
 scim            SCIM_CHEWING    pv              rar             tree
 TOFRODOS        unrar           unzip           xdg-utils       zip
 // added by b01902062@csie.ntu.edu.tw
-BSDCPIO         BSDTAR          bochs           convmv          chrpath
-cgdb            DEV86           diffstat        FAKECHROOT      fdupes
-HTE             htop            meld            menumaker       MKISOFS
-ncdu            PATCHELF        QEMU            rpm2cpio        socat
-tig             UIM_FEP         UNIX2DOS        upx
+BSDCPIO         BSDTAR          bochs           CDIALOG         cgdb
+chrpath         convmv          DEV86           diffstat        FAKECHROOT
+fdupes          HTE             htop            meld            menumaker
+MKISOFS         ncdu            PATCHELF        QEMU            rpm2cpio
+socat           tig             UIM_FEP         UNAR            UNIX2DOS
+upx
 #endif
 
 // Web
 #ifdef WSPKG_WEB
-W3M
+FLASH_PLUGIN    FIREFOX         lynx            w3m             W3M_EL
+JAVA_PLUGIN     // added by b01902062@csie.ntu.edu.tw
 #endif
 
 // X11
 #ifdef WSPKG_X11
+afterstep       DESKTOP_BASE    fvwm            IM_SWITCH       mlterm
+MLTERM_TOOLS    rxvt            RXVT_ML         VNCSERVER       WINDOWMAKER
+xchm            xorg            xscreensaver    xterm           XVFB
+// added by b01902062@csie.ntu.edu.tw
+fbpanel         obconf          openbox         XEPHYR          xrestop
 #endif