Index: head/editors/yudit/Makefile
===================================================================
--- head/editors/yudit/Makefile	(revision 263631)
+++ head/editors/yudit/Makefile	(revision 263632)
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	yudit
 # Date created:		October 3, 1998
 # Whom:			rch@richard.eu.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	yudit
 PORTVERSION=	2.9.2
 CATEGORIES=	editors converters print
 MASTER_SITES=	http://yudit.org/download/ \
 		SUNSITE/apps/editors/X
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-lingual unicode text editor with TTF support
 
-CONFLICTS=	uniconvertor-[0-9]*
+CONFLICTS=	netatalk-[0-9]*
 
 USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LC_ALL=
 MAKE_ENV=	LC_ALL=
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		mytool.1 uniconv.1 uniprint.1
 
 .include <bsd.port.mk>

Property changes on: head/editors/yudit/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/net/netatalk/Makefile
===================================================================
--- head/net/netatalk/Makefile	(revision 263631)
+++ head/net/netatalk/Makefile	(revision 263632)
@@ -1,119 +1,119 @@
 # Ports collection makefile for:    netatalk
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netatalk
 PORTVERSION=	2.1.3
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File server for Mac OS X
 
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_AUTOTOOLS=	libtool:22
 USE_BDB=	46+
 USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	netatalk
 
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc \
 			--with-libiconv=${LOCALBASE} \
 			--with-libgcrypt-dir=${LOCALBASE} \
 			--with-uams-path=${LOCALBASE}/libexec/netatalk-uams \
 			--with-bdb=${LOCALBASE}
 
 OPTIONS=	APPLETALK	"Enable AppleTalk protocol support" on \
 		SRVLOC		"Enable Service Location Protocol support" off \
 		PAM		"Enable PAM support" off \
 		TIMELORD	"Enable Timelord network time service" off \
 		KRB5		"Enable Kerberos V UAM" off
 
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
 		atalkd.conf papd.conf netatalk.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
 MAN1=		achfile.1 ad.1 aecho.1 afile.1 afppasswd.1 apple_cp.1 \
 		apple_dump.1 apple_mv.1 apple_rm.1 asip-status.pl.1 dbd.1 \
 		getzones.1 hqx2bin.1 macbinary.1 megatron.1 nbp.1 nbplkup.1 \
 		nbprgstr.1 nbpunrgstr.1 netatalk-config.1 pap.1 papstatus.1 \
 		psorder.1 single2bin.1 unbin.1 unhex.1 uniconv.1 unsingle.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
 MAN5=		AppleVolumes.5 AppleVolumes.default.5 \
 		AppleVolumes.system.5 afp_ldap.conf.5 afp_signature.conf.5 \
 		afpd.conf.5 atalkd.conf.5 netatalk.conf.5 papd.conf.5
 MAN8=		afp_acls.8 afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 \
 		papstatus.8 psf.8 timelord.8
 
-CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1* uniconvertor-1.*
+CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1* yudit-[0-9]*
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_KRB5)
 CONFIGURE_ARGS+=	--enable-krbV-uam
 PLIST_SUB+=		NETATALKKRB5=""
 .else
 PLIST_SUB+=		NETATALKKRB5="@comment "
 .endif
 
 .if defined(WITH_APPLETALK)
 CONFIGURE_ARGS+=	--with-ddp
 .else
 CONFIGURE_ARGS+=	--without-ddp
 .endif
 
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 PLIST_SUB+=		NETATALKPAM=""
 .else
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=		NETATALKPAM="@comment "
 .endif
 
 .if defined(WITH_SRVLOC)
 CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
 LIB_DEPENDS+=		slp.1:${PORTSDIR}/net/openslp
 SUB_LIST+=		SRVLOC="slpd"
 .else
 SUB_LIST+=		SRVLOC=""
 .endif
 
 .if defined (WITH_TIMELORD)
 CONFIGURE_ARGS+=	--enable-timelord
 PLIST_SUB+=		TIMELORD=""
 .else
 PLIST_SUB+=		TIMELORD="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
 	    	s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g' \
 		${WRKSRC}/configure
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \
 		${PREFIX}/bin/test_parse_mtab \
 		${PREFIX}/bin/afpd-mtab.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${PREFIX}/bin/macusers
 .for i in ${FILES}
 	[ -f ${PREFIX}/etc/${i} ] || \
 		${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i}
 .endfor
 .for i in ${LINKS}
 	( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} )
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/net/netatalk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.90
\ No newline at end of property
+1.91
\ No newline at end of property