CVS commit: pkgsrc/net/netatalk22

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Apr 14 09:15:57 UTC 2017

Modified Files:
        pkgsrc/net/netatalk22: Makefile

Log Message:
GC list of conflicts - the pkgsrc framework will detect PLIST
conflicts automajically, says wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/netatalk22/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk22/Makefile
diff -u pkgsrc/net/netatalk22/Makefile:1.7 pkgsrc/net/netatalk22/Makefile:1.8
--- pkgsrc/net/netatalk22/Makefile:1.7  Thu Apr 13 14:35:53 2017
+++ pkgsrc/net/netatalk22/Makefile      Fri Apr 14 09:15:57 2017
@@ -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_
 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