diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2012-06-11 09:52:17 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2012-06-11 09:52:17 +0000 |
| commit | cf12c69ab5e2d629ec7eba3a8bcb5fe89c40040b (patch) | |
| tree | 0a3e74f2de1eba694c7db8df714d171d8245ebfc | |
| parent | Update to 0.0.9. (diff) | |
Register CONFLICTS
Submitted by: "Sulev-Madis 'ketas' Silber" <madis555@hot.ee> (via mail)
Notes
Notes:
svn path=/head/; revision=299034
| -rw-r--r-- | net-p2p/microdc2/Makefile | 4 | ||||
| -rw-r--r-- | science/x11iraf/Makefile | 4 | ||||
| -rw-r--r-- | security/tthsum/Makefile | 3 | ||||
| -rw-r--r-- | x11/xterm/Makefile | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile index 97db3f15cdf5..869f86576222 100644 --- a/net-p2p/microdc2/Makefile +++ b/net-p2p/microdc2/Makefile @@ -7,7 +7,7 @@ PORTNAME= microdc2 PORTVERSION= 0.15.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p MASTER_SITES= http://corsair626.no-ip.org/microdc/ \ http://corsair626.no-ip.org/microdc/archive/ @@ -15,6 +15,8 @@ MASTER_SITES= http://corsair626.no-ip.org/microdc/ \ MAINTAINER= pankov_p@mail.ru COMMENT= A command-line based Direct Connect client +CONFLICTS= tthsum-[0-9]* + GNU_CONFIGURE= yes USE_ICONV= yes USE_GNOME= libxml2 diff --git a/science/x11iraf/Makefile b/science/x11iraf/Makefile index d107bd1b2825..0bbe8fca970a 100644 --- a/science/x11iraf/Makefile +++ b/science/x11iraf/Makefile @@ -6,7 +6,7 @@ PORTNAME= x11iraf PORTVERSION= 1.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science astro MASTER_SITES= ftp://iraf.noao.edu/iraf/x11iraf/ DISTNAME= x11iraf-v${PORTVERSION}-bin.freebsd @@ -14,6 +14,8 @@ DISTNAME= x11iraf-v${PORTVERSION}-bin.freebsd MAINTAINER= dsyphers@u.washington.edu COMMENT= Provides graphical tools to work with IRAF +CONFLICTS= xterm-[0-9]* + LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x NO_BUILD= yes diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile index 22982471d64d..97534a1e8d9b 100644 --- a/security/tthsum/Makefile +++ b/security/tthsum/Makefile @@ -7,6 +7,7 @@ PORTNAME= tthsum PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://tthsum.devs.nu/pkg/ \ CRITICAL @@ -16,6 +17,8 @@ COMMENT= A command-line utility for generating and checking TTH message digests LICENSE= GPLv3 +CONFLICTS= microdc2-[0-9]* + USE_GMAKE= yes MANCOMPRESSED= yes diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 496a0f54e061..8bff3416696c 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -7,6 +7,7 @@ PORTNAME= xterm PORTVERSION= 279 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL @@ -15,6 +16,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ehaupt@FreeBSD.org COMMENT= Terminal emulator for the X Window System +CONFLICTS= x11iraf-[0-9]* + USE_XORG= xaw xft WANT_GNOME= desktopfileutils GNU_CONFIGURE= yes |