summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorhauke <hauke>2017-04-14 09:15:57 +0000
committerhauke <hauke>2017-04-14 09:15:57 +0000
commit6ad861b803ff0e54f8f88fa2bc8f3269dd76367a (patch)
treeac7419df27fb35b266dfffc7f7fe60c93f44b651 /net
parenta0938bdc82533635a867e8f2bed89e9da52e6937 (diff)
downloadpkgsrc-6ad861b803ff0e54f8f88fa2bc8f3269dd76367a.tar.gz
GC list of conflicts - the pkgsrc framework will detect PLIST
conflicts automajically, says wiz@
Diffstat (limited to 'net')
-rw-r--r--net/netatalk22/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/netatalk22/Makefile b/net/netatalk22/Makefile
index af8fe672fac..ef452287f71 100644
--- a/net/netatalk22/Makefile
+++ b/net/netatalk22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/04/13 14:35:53 hauke Exp $
+# $NetBSD: Makefile,v 1.8 2017/04/14 09:15:57 hauke Exp $
DISTNAME= netatalk-2.2.5
PKGNAME= ${DISTNAME:C/-/22-/}
@@ -32,9 +32,6 @@ CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
-CONFLICTS= netatalk3-[0-9]* netatalk30-[0-9]* netatalk-[0-9]*
-CONFLICTS+= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
-
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= VARBASE