diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-03-18 23:56:49 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-03-18 23:56:49 +0800 |
| commit | c6964ce40ebe4abe91ad3a23ac41d30fe3274315 (patch) | |
| tree | e9dd280ca89466ababeed2d64b547fba8e1551b8 /freebsd.pkg | |
| parent | 7d1b1fbf9c6352b60c1a8080d3088b4a22702fe9 (diff) | |
| download | wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.tar wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.tar.gz wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.tar.bz2 wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.tar.lz wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.tar.xz wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.tar.zst wspkg-c6964ce40ebe4abe91ad3a23ac41d30fe3274315.zip | |
移除 freebsd.pkg 中互相衝突的項目
Diffstat (limited to 'freebsd.pkg')
| -rw-r--r-- | freebsd.pkg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/freebsd.pkg b/freebsd.pkg index bd8727a..5a40506 100644 --- a/freebsd.pkg +++ b/freebsd.pkg @@ -182,7 +182,7 @@ // Net #define MTR mtr-nox11 #define STUNNEL stunnel -#define VNCVIEWER tightvnc tigervnc +#define VNCVIEWER tigervnc #define NS2 ns #define NS3 NULL // FIXME: currently not available? #define BSDFTPD_SSL bsdftpd-ssl @@ -223,7 +223,7 @@ #define PYTHON_BSDDB3 py27-bsddb3 #define PYTHON_IMAGING py27-imaging #define PYTHON_NUMPY py27-numpy -#define PYTHON_SETUPTOOLS py27-setuptools +#define PYTHON_SETUPTOOLS py27-setuptools27 #define PYTHON_LIBSVM libsvm-python #define PYTHON_GSL py27-gsl #define PYTHON_MARKDOWN py27-markdown @@ -334,10 +334,10 @@ // X11 #define DESKTOP_BASE NULL -#define FVWM fvwm fvwm2-i18n +#define FVWM fvwm2-i18n #define IM_SWITCH NULL #define MLTERM_TOOLS NULL #define RXVT_ML rxvt-unicode -#define VNCSERVER tightvnc tigervnc +#define VNCSERVER tigervnc #define XVFB xorg-vfbserver #define XEPHYR xephyr |