summaryrefslogtreecommitdiff
path: root/chinese
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2013-04-16 18:23:45 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2013-04-16 18:23:45 +0000
commitac8c103656306da7a3f56833cc22191c99564405 (patch)
tree86e0032a27bd15781d177280fa35e889874c761d /chinese
parent- Update to 1.05 (diff)
- "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
Notes
Notes: svn path=/head/; revision=315876
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