加大縮排

3 files changed, 188 insertions, 160 deletions

diff --git a/debian.pkg b/debian.pkg
index 3a0e758..1082f33 100644
--- a/debian.pkg
+++ b/debian.pkg
@@ -7,102 +7,110 @@
 // Keyring
 
 // Standard
-#define BC              bc
-#define BIND            bind9-host dnsutils
-#define FILE            file
-#define FINGER          finger
-#define FTP             ftp
-#define INETD           openbsd-inetd
-#define ISPELL          ispell
-#define LESS            less
-#define LOCATE          mlocate
-#define NCURSES_TERM    ncurses-term
-#define PATCH           patch
-#define PCI             pciutils
-#define PERL            perl
-#define PYTHON2         python
-#define PYTHON3         python3
-#define SHARUTILS       sharutils
-#define SSH             openssh-client
-#define STRACE          strace
-#define TELNET          telnet
-#define TIME            time
-#define USB             usbutils
-#define WAMERICAN       wamerican
-#define WHOIS           whois
+#define BC                  bc
+#define BIND                bind9-host dnsutils
+#define FILE                file
+#define FINGER              finger
+#define FTP                 ftp
+#define INETD               openbsd-inetd
+#define ISPELL              ispell
+#define LESS                less
+#define LOCATE              mlocate
+#define NCURSES_TERM        ncurses-term
+#define PATCH               patch
+#define PCI                 pciutils
+#define PERL                perl
+#define PYTHON2             python
+#define PYTHON3             python3
+#define SHARUTILS           sharutils
+#define SSH                 openssh-client
+#define STRACE              strace
+#define TELNET              telnet
+#define TIME                time
+#define USB                 usbutils
+#define WAMERICAN           wamerican
+#define WHOIS               whois
 
 // Shell
 // Browser
 // Mail
 // Admin
-#define ACPI            acpid
-#define CPUFREQ         cpufrequtils
-#define IOTOP           iotop
-#define MENU            menu menu-xdg
-#define MCELOG          mcelog
-#define PARTED          parted
-#define SYSSTAT         sysstat
-#define FDISK           util-linux
-#define GDISK           gdisk
+#define ACPI                acpid
+#define CPUFREQ             cpufrequtils
+#define IOTOP               iotop
+#define MENU                menu menu-xdg
+#define MCELOG              mcelog
+#define PARTED              parted
+#define SYSSTAT             sysstat
+#define FDISK               util-linux
+#define GDISK               gdisk
 
 // Devel
-#define ANT             ant
-#define CLANG           clang libclang-dev
-#define GCC             g++ gfortran
-#define GDB             gdb
-#define GOLANG          golang
-#define GIT             git git-cvs git-svn git-gui gitk gitg // more plugins
-#define INDENT          indent
-#define MAKE            make pmake bmake
-#define MINGW           mingw-w64  // mingw32 is obsolete
-#define OPENJDK6        openjdk-6-jdk
-#define OPENJDK7        openjdk-7-jdk
-#define SUBVERSION      subversion
-#define TCL             tcl-dev
-#define TK              tk-dev
+#define ANT                 ant
+#define CLANG               clang libclang-dev
+#define GCC                 g++ gfortran
+#define GDB                 gdb
+#define GOLANG              golang
+#define GIT                 git git-cvs git-svn git-gui gitk gitg // more plugins
+#define INDENT              indent
+#define MAKE                make pmake bmake
+#define MINGW               mingw-w64  // mingw32 is obsolete
+#define OPENJDK6            openjdk-6-jdk
+#define OPENJDK7            openjdk-7-jdk
+#define SUBVERSION          subversion
+#define TCL                 tcl-dev
+#define TK                  tk-dev
 
 // Doc
-#define LIBC_DOC        glibc-doc glibc-doc-reference // reference manual
-#define MAKE_DOC        make-doc
-#define MANPAGES        manpages-dev
-#define MANPAGES_POSIX  manpages-posix-dev
-#define PERL_DOC        perl-doc
-#define PYTHON2_DOC     python-doc
-#define PYTHON3_DOC     python3-doc
-#define TCL_DOC         tcl8.4-dev
-#define TK_DOC          tk8.4-dev
-#define GCC_DOC         gcc-doc libstdc++-4.8-doc
+#define LIBC_DOC            glibc-doc glibc-doc-reference // reference manual
+#define MAKE_DOC            make-doc
+#define MANPAGES            manpages-dev
+#define MANPAGES_POSIX      manpages-posix-dev
+#define PERL_DOC            perl-doc
+#define PYTHON2_DOC         python-doc
+#define PYTHON3_DOC         python3-doc
+#define TCL_DOC             tcl8.4-dev
+#define TK_DOC              tk8.4-dev
+#define GCC_DOC             gcc-doc libstdc++-4.8-doc
 
 // Editors
-#define CTAGS           exuberant-ctags
-#define EMACS           emacs
-#define LIBREOFFICE     libreoffice \
-                        libreoffice-l10n-zh-tw libreoffice-help-zh-tw
-#define VIM_GTK         vim-gtk
+#define CTAGS               exuberant-ctags
+#define EMACS               emacs
+#define LIBREOFFICE         libreoffice \
+                            libreoffice-l10n-zh-tw libreoffice-help-zh-tw
+#define VIM_GTK             vim-gtk
 
 // Electronics
 // Fonts
-#define ARPHIC          fonts-arphic-bkai00mp fonts-arphic-bsmi00lp \
-                        fonts-arphic-gbsn00lp fonts-arphic-gkai00mp
-#define BAEKMUK         fonts-baekmuk
-#define CJKUNIFONTS     fonts-arphic-ukai fonts-arphic-uming
-#define LIBERATION      fonts-liberation
-#define IPAFONT         fonts-ipafont-gothic fonts-ipafont-mincho
-#define WQY             ttf-wqy-microhei fonts-wqy-zenhei
-#define XFONTS_CYRILLIC xfonts-cyrillic
-#define XFONTS_INTL_CHINESE \
-                        xfonts-intl-chinese
-#define XFONTS_WQY      xfonts-wqy
+#define ARPHIC              fonts-arphic-bkai00mp fonts-arphic-bsmi00lp \
+                            fonts-arphic-gbsn00lp fonts-arphic-gkai00mp
+#define BAEKMUK             fonts-baekmuk
+#define CJKUNIFONTS         fonts-arphic-ukai fonts-arphic-uming
+#define LIBERATION          fonts-liberation
+#define IPAFONT             fonts-ipafont-gothic fonts-ipafont-mincho
+#define WQY                 ttf-wqy-microhei fonts-wqy-zenhei
+#define XFONTS_CYRILLIC     xfonts-cyrillic
+#define XFONTS_INTL_CHINESE xfonts-intl-chinese
+#define XFONTS_WQY          xfonts-wqy
 
 // GNOME
-#define GDM             gdm3
-#define GNOME_USER_DOCS gnome-user-guide
-#define GTK2_ENGINES    gtk2-engines
-#define GVFS            gvfs-bin gvfs-backends
-#define REMMINA         remmina remmina-plugin-gnome remmina-plugin-nx \
-                        remmina-plugin-rdp remmina-plugin-telepathy \
-                        remmina-plugin-vnc remmina-plugin-xdmcp
-#define GTK2            libgtk2.0-dev libgtk2.0-doc libgtk2.0-0-dbg \
-                        libgtkmm-2.4-dev libgtkmm-2.4-doc libgtkmm-2.4-dbg
-#define GTK3            libgtk-3-dev libgtk-3-doc libgtk-3-0-dbg \
-                        libgtkmm-3.0-dev libgtkmm-3.0-doc libgtkmm-3.0-dbg
+#define GDM                 gdm3
+#define GNOME_USER_DOCS     gnome-user-guide
+#define GTK2_ENGINES        gtk2-engines
+#define GVFS                gvfs-bin gvfs-backends
+#define REMMINA             remmina remmina-plugin-gnome remmina-plugin-nx \
+                            remmina-plugin-rdp remmina-plugin-telepathy \
+                            remmina-plugin-vnc remmina-plugin-xdmcp
+#define GTK2                libgtk2.0-dev libgtk2.0-doc libgtk2.0-0-dbg \
+                            libgtkmm-2.4-dev libgtkmm-2.4-doc libgtkmm-2.4-dbg
+#define GTK3                libgtk-3-dev libgtk-3-doc libgtk-3-0-dbg \
+                            libgtkmm-3.0-dev libgtkmm-3.0-doc libgtkmm-3.0-dbg
+
+// Graphics
+#define IMAGEMAGICK         imagemagick
+#define JPEG                libjpeg-progs
+
+// Haskell
+#define HUGS                hugs
+#define HASKELL_PLATFORM    haskell-platform
+#define HASKELL_OPENGL      libghc-opengl-dev
diff --git a/freebsd.pkg b/freebsd.pkg
index ff6bc7f..dca0b36 100644
--- a/freebsd.pkg
+++ b/freebsd.pkg
@@ -9,96 +9,104 @@
 // ===========================================================================
 
 // Standard
-#define BC              NULL
-#define BIND            bind-tools
-#define FILE            NULL
-#define FINGER          NULL
-#define FTP             NULL
-#define INETD           NULL
-#define ISPELL          aspell-ispell
-#define LESS            NULL
-#define LOCATE          NULL
-#define NCURSES_TERM    NULL
-#define PATCH           NULL
-#define PCI             NULL
-#define PERL            perl5
-#define PYTHON2         python2
-#define PYTHON3         python3
-#define SHARUTILS       NULL
-#define SSH             NULL
-#define STRACE          NULL
-#define TELNET          NULL
-#define TIME            NULL
-#define USB             NULL
-#define WAMERICAN       NULL
-#define WHOIS           NULL
+#define BC                  NULL
+#define BIND                bind-tools
+#define FILE                NULL
+#define FINGER              NULL
+#define FTP                 NULL
+#define INETD               NULL
+#define ISPELL              aspell-ispell
+#define LESS                NULL
+#define LOCATE              NULL
+#define NCURSES_TERM        NULL
+#define PATCH               NULL
+#define PCI                 NULL
+#define PERL                perl5
+#define PYTHON2             python2
+#define PYTHON3             python3
+#define SHARUTILS           NULL
+#define SSH                 NULL
+#define STRACE              NULL
+#define TELNET              NULL
+#define TIME                NULL
+#define USB                 NULL
+#define WAMERICAN           NULL
+#define WHOIS               NULL
 
 // Shell
 // Browser
 // Mail
 // Admin
-#define ACPI            NULL
-#define CPUFREQ         NULL
-#define IOTOP           NULL
-#define MENU            NULL
-#define MCELOG          mcelog
-#define PARTED          NULL
-#define SYSSTAT         NULL
-#define FDISK           linuxfdisk
-#define GDISK           gdisk
+#define ACPI                NULL
+#define CPUFREQ             NULL
+#define IOTOP               NULL
+#define MENU                NULL
+#define MCELOG              mcelog
+#define PARTED              NULL
+#define SYSSTAT             NULL
+#define FDISK               linuxfdisk
+#define GDISK               gdisk
 
 // Devel
-#define ANT             apache-ant
-#define CLANG           NULL
-#define GCC             gcc gcc48
-#define GDB             gdb
-#define GOLANG          NULL
-#define GIT             git-subversion gitg // FIXME: change options to get GUI
-#define INDENT          NULL
-#define MAKE            gmake bmake
-#define MINGW           NULL
-#define OPENJDK6        openjdk6
-#define OPENJDK7        openjdk
-#define SUBVERSION      subversion
-#define TCL             tcl84
-#define TK              tk84
+#define ANT                 apache-ant
+#define CLANG               NULL
+#define GCC                 gcc gcc48
+#define GDB                 gdb
+#define GOLANG              NULL
+#define GIT                 git-subversion gitg // FIXME: GUI config options
+#define INDENT              NULL
+#define MAKE                gmake bmake
+#define MINGW               NULL
+#define OPENJDK6            openjdk6
+#define OPENJDK7            openjdk
+#define SUBVERSION          subversion
+#define TCL                 tcl84
+#define TK                  tk84
 
 // Doc
-#define LIBC_DOC        NULL
-#define MAKE_DOC        NULL
-#define MANPAGES        NULL
-#define MANPAGES_POSIX  NULL
-#define PERL_DOC        NULL
-#define PYTHON2_DOC     NULL
-#define PYTHON3_DOC     NULL
-#define TCL_DOC         NULL
-#define TK_DOC          NULL
-#define GCC_DOC         NULL
+#define LIBC_DOC            NULL
+#define MAKE_DOC            NULL
+#define MANPAGES            NULL
+#define MANPAGES_POSIX      NULL
+#define PERL_DOC            NULL
+#define PYTHON2_DOC         NULL
+#define PYTHON3_DOC         NULL
+#define TCL_DOC             NULL
+#define TK_DOC              NULL
+#define GCC_DOC             NULL
 
 // Editors
-#define CTAGS           ctags
-#define EMACS           emacs24
-#define LIBREOFFICE     libreoffice zh_TW-libreoffice
-#define VIM_GTK         vim
+#define CTAGS               ctags
+#define EMACS               emacs24
+#define LIBREOFFICE         libreoffice zh_TW-libreoffice
+#define VIM_GTK             vim
 
 // Electronics
 // Fonts
-#define ARPHIC          zh-arphicttf
-#define BAEKMUK         ko-baekmukfonts-ttf
-#define CJKUNIFONTS     zh-CJKUnifonts
-#define LIBERATION      liberation-fonts-ttf
-#define IPAFONT         ja-font-ipa ja-font-mplus-ipa ja-font-ipaex
-#define WQY             wqy-fonts
-#define XFONTS_CYRILLIC xorg-fonts-cyrillic
-#define XFONTS_INTL_CHINESE \
-                        NULL
-#define XFONTS_WQY      NULL
+#define ARPHIC              zh-arphicttf
+#define BAEKMUK             ko-baekmukfonts-ttf
+#define CJKUNIFONTS         zh-CJKUnifonts
+#define LIBERATION          liberation-fonts-ttf
+#define IPAFONT             ja-font-ipa ja-font-mplus-ipa ja-font-ipaex
+#define WQY                 wqy-fonts
+#define XFONTS_CYRILLIC     xorg-fonts-cyrillic
+#define XFONTS_INTL_CHINESE NULL
+#define XFONTS_WQY          NULL
 
 // GNOME
-#define GDM             gdm
-#define GNOME_USER_DOCS gnome-user-docs
-#define GTK2_ENGINES    gtk-engines2
-#define GVFS            gvfs
-#define REMMINA         remmina remmina-plugins
-#define GTK2            gtk2 gtk2-reference gtkmm24 gtkmm24-reference
-#define GTK3            gtk3 gtk3-reference gtkmm30 gtkmm30-reference
+#define GDM                 gdm
+#define GNOME_USER_DOCS     gnome-user-docs
+#define GTK2_ENGINES        gtk-engines2
+#define GVFS                gvfs
+#define REMMINA             remmina remmina-plugins
+#define GTK2                gtk2 gtk2-reference gtkmm24 gtkmm24-reference
+#define GTK3                gtk3 gtk3-reference gtkmm30 gtkmm30-reference
+
+// Graphics
+#define IMAGEMAGICK         ImageMagick
+#define JPEG                jpeg
+
+// Haskell
+#define HUGS                hugs98
+#define HASKELL_PLATFORM    hs-haskell-platform
+#define HASKELL_OPENGL      hs-OpenGL
diff --git a/packages.h b/packages.h
index 2f56855..517ffd3 100644
--- a/packages.h
+++ b/packages.h
@@ -28,6 +28,8 @@
 # define WSPKG_ELECTRONICS
 # define WSPKG_FONTS
 # define WSPKG_GNOME
+# define WSPKG_GRAPHICS
+# define WSPKG_HASKELL
 #endif
 
 // ===========================================================================
@@ -129,3 +131,13 @@ ghex            glade           GTK2            GTK3            gnome-terminal
 gnome-screenshot                gnome-system-monitor            nautilus
 vinagre
 #endif
+
+// Graphics
+#ifdef WSPKG_GRAPHICS
+gimp            geeqie          IMAGEMAGICK     JPEG            graphviz
+#endif
+
+// Haskell
+#ifdef WSPKG_HASKELL
+ghc             HUGS            HASKELL_PLATFORM                HASKELL_OPENGL
+#endif