aboutsummaryrefslogtreecommitdiffstats
path: root/chinese
diff options
context:
space:
mode:
authormadpilot <madpilot@FreeBSD.org>2013-04-17 02:23:45 +0800
committermadpilot <madpilot@FreeBSD.org>2013-04-17 02:23:45 +0800
commit6b11d558cc5df75f8ac7a17c0f4bb6b27324e068 (patch)
tree86e0032a27bd15781d177280fa35e889874c761d /chinese
parent68ec890e6e5cad237ab4d6a1b8c69b476c544080 (diff)
downloadfreebsd-ports-gnome-6b11d558cc5df75f8ac7a17c0f4bb6b27324e068.tar.gz
freebsd-ports-gnome-6b11d558cc5df75f8ac7a17c0f4bb6b27324e068.tar.zst
freebsd-ports-gnome-6b11d558cc5df75f8ac7a17c0f4bb6b27324e068.zip
- "Update" to 2.5.12. This is the supported stable branch upstream
- Bump PORTEPOCH - Trim Makefile header - Add CONFLICTS_INSTALL [1] - Make rc scripts more rclint compliant - Update WWW line in pkg-descr PR: ports/175063 Submitted by: Jason Bacon <jwbacon@tds.net> (maintainer) Approved by: danfe (maintainer of games/qstat, via email) [1] Approved by: Kai Wang <kaiwang27@gmail.com> (maintainer of chinese/qterm) [1] Feature safe: yes
Diffstat (limited to 'chinese')
-rw-r--r--chinese/qterm/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index 7e6c261c39d5..50dc5ec67466 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -19,6 +19,8 @@ USE_XORG= x11 ice
MAKE_JOBS_SAFE= yes
INSTALLS_ICONS= yes
+CONFLICTS_INSTALL= torque-[0-9]*
+
OPTIONS_DEFINE= DBUS OPENSSL PHONON QTSCRIPT KDE
OPTIONS_DEFAULT= DBUS OPENSSL PHONON QTSCRIPT