mark conflict: astro/jday, net/netatalk

astro/jday/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2013/01/09 23:06:24 sthen Exp $
 
 COMMENT=	astronomical julian date calculator
 
 DISTNAME=	jday-2.4
-REVISION=	0
+REVISION=	1
 SHARED_LIBS +=  jday                 0.0      # .2.4
 CATEGORIES=	astro
 HOMEPAGE=	http://jday.sourceforge.net/

astro/jday/distinfo

@@ -1,5 +1,2 @@
-MD5 (jday-2.4.tar.gz) = gXr1YAXRNGZ3Jx7S+rY+9Q==
-RMD160 (jday-2.4.tar.gz) = 9p17XwD8P8nrt/5/sNPA0dzcCSc=
-SHA1 (jday-2.4.tar.gz) = RrAg7zFeshs7DlGSaTaH7yhs8uE=
 SHA256 (jday-2.4.tar.gz) = OxXzobVS/658NDvUe/iegHPanvjC7G15uQ1W+MOgb9o=
 SIZE (jday-2.4.tar.gz) = 337012

astro/jday/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/11/02 21:30:57 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.5 2013/01/09 23:06:24 sthen Exp $
+@conflict netatalk-*
 %%SHARED%%
 bin/dbd
 bin/j2d

net/netatalk/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.44 2012/10/10 08:11:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.45 2013/01/09 23:06:24 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	AFP file and print services for IP networks
 
 DISTNAME=	netatalk-2.2.3
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2

net/netatalk/distinfo

@@ -1,5 +1,2 @@
-MD5 (netatalk-2.2.3.tar.bz2) = C1oGRYNhg7DlSMz71cAi+A==
-RMD160 (netatalk-2.2.3.tar.bz2) = QNHdK22jheSN5fwPnMqFzbEwswk=
-SHA1 (netatalk-2.2.3.tar.bz2) = 1tDPKnToso4Hb3aHJi8pc7VaB88=
 SHA256 (netatalk-2.2.3.tar.bz2) = sIjmzGI3962Yr2WBKnS8yDCi1K6+6nHP2TKs6O+TEyw=
 SIZE (netatalk-2.2.3.tar.bz2) = 1288642

net/netatalk/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.8 2012/04/11 18:39:13 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.9 2013/01/09 23:06:24 sthen Exp $
+@conflict jday-*
 @bin bin/ad
 @bin bin/adv1tov2
 @bin bin/afpldaptest