aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2008-09-25 17:22:48 +0000
committerCy Schubert <cy@FreeBSD.org>2008-09-25 17:22:48 +0000
commit97cd931c32ac487dab586d79887b7df4d0a0f974 (patch)
treeca243046915b930185708ccd13898bd9204277f2 /security
parent6e178e6ea296ca8a5cf6db188bd7ece6ce994838 (diff)
Fix conflicts.
Point hat to: myself
Notes
Notes: svn path=/head/; revision=220767
Diffstat (limited to 'security')
-rw-r--r--security/fwbuilder2/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index ad7be503d963..679d79bf97d5 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Firewall Builder GUI and policy compilers
DEPRECATED= This version of fwbuilder is no longer supported by its author
EXPIRATION_DATE= 2008-10-01
-CONFLICTS= libfwbuilder-2.*
+CONFLICTS= fwbuilder-3.*
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
LIB_DEPENDS= fwbuilder.7:${PORTSDIR}/security/libfwbuilder2