Index: head/comms/conserver/Makefile
===================================================================
--- head/comms/conserver/Makefile	(revision 387141)
+++ head/comms/conserver/Makefile	(revision 387142)
@@ -1,62 +1,64 @@
 # Created by: Peter Wemm <peter@netplex.com.au>
 # $FreeBSD$
 
 PORTNAME=	conserver
 PORTVERSION=	8.5
 PORTREVISION=	4
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.physics.purdue.edu/pub/pundits/ \
 		http://www.komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manage remote serial consoles via TCP/IP
 
 BUILD_DEPENDS=	makeme:${PORTSDIR}/devel/msrc0 \
 		mkcmd:${PORTSDIR}/devel/mkcmd
 
+CONFLICTS_INSTALL=	conserver-com-[0-9]* rubygem-gitlab-grack-[0-9]*
+
 # Set this to where you want console(8) to connect to by default
 # or use something like ``make DEFAULTHOST=myserver.mydomain.net''
 DEFAULTHOST?=	localhost
 DEFAULTPORT?=	782
 MAKE_ENV+=	DEFAULTHOST="${DEFAULTHOST}" DEFAULTPORT="${DEFAULTPORT}"
 #PKGMESSAGE=	${WRKDIR}/MESSAGE
 USE_RC_SUBR=	conserver
 
 do-build:
 	${REINPLACE_CMD} -e 's:/usr/local/lib:${PREFIX}/etc:g'  \
 	    ${WRKSRC}/etc/conserver/cons.h
 .for d in etc/conserver etc/console etc/autologin
 	@(cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \
 	    ${MAKE_ARGS} ${ALL_TARGET})
 .endfor
 	#@${SED} -e 's:/usr/local:${PREFIX}:g'  \
 	#    ${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
 do-install:
 .for d in etc/conserver etc/console etc/autologin
 	(cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \
 	    ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/lib/conserver.cf/conserver.cf \
 	    ${STAGEDIR}${PREFIX}/etc/conserver.cf.eg
 	@${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g'  \
 	    ${WRKSRC}/lib/conserver.cf/conserver.cf.man  \
 	    > ${STAGEDIR}${PREFIX}/man/man5/conserver.cf.5
 	@${SED} -e 's:/usr/local/etc:${PREFIX}/sbin:g'  \
 	    ${WRKSRC}/etc/autologin/autologin.man  \
 	    > ${STAGEDIR}${PREFIX}/man/man8/autologin.8
 	@${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g'  \
 	    ${WRKSRC}/etc/conserver/conserver.man  \
 	    > ${STAGEDIR}${PREFIX}/man/man8/conserver.8
 	@${SED} -e 's:console\.itsd\.fedex\.com:${DEFAULTHOST}:g'  \
 	    ${WRKSRC}/etc/console/console.man  \
 	    > ${STAGEDIR}${PREFIX}/man/man8/console.8
 	@${CHMOD} 0444 ${STAGEDIR}${PREFIX}/man/man5/conserver.cf.5  \
 	    ${STAGEDIR}${PREFIX}/man/man8/autologin.8  \
 	    ${STAGEDIR}${PREFIX}/man/man8/conserver.8  \
 	    ${STAGEDIR}${PREFIX}/man/man8/console.8
 	@#	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: head/comms/conserver-com/Makefile
===================================================================
--- head/comms/conserver-com/Makefile	(revision 387141)
+++ head/comms/conserver-com/Makefile	(revision 387142)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	conserver
 PORTVERSION=	8.1.18
 PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://www.conserver.com/ \
 		ftp://ftp.conserver.com/conserver/
 PKGNAMESUFFIX=	-com
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Application that allows multiple users to watch serial consoles
 
+CONFLICTS_INSTALL=	conserver-[0-9]* rubygem-gitlab-grack-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
 		--with-pam --with-libwrap --with-openssl
 USE_OPENSSL=	yes
 USE_RC_SUBR=	conserver
 
 OPTIONS_DEFINE=	UDS GSSAPI GSSAPIONLY STRIPREALM
 UDS_DESC=	Use Unix domain sockets for client/server
 STRIPREALM_DESC=Strip @REALM when using GSSAPI
 GSSAPIONLY_DESC=Never prompt for a password when using GSSAPI
 
 .include <bsd.port.options.mk>
 
 DEFAULTPORT?=	782
 DEFAULTHOST?=	localhost
 
 .if ${PORT_OPTIONS:MUDS}
 CONFIGURE_ARGS+=	--with-uds
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI}
 CONFIGURE_ARGS+=	--with-gssapi
 .if ${PORT_OPTIONS:MSTRIPREALM}
 CONFIGURE_ARGS+=	--with-striprealm
 .endif
 .if ${PORT_OPTIONS:MGSSAPIONLY}
 EXTRA_PATCHES=		${FILESDIR}/extra-patch-conserver__master.c
 .endif
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert
 
 .include <bsd.port.mk>
Index: head/www/rubygem-gitlab-grack/Makefile
===================================================================
--- head/www/rubygem-gitlab-grack/Makefile	(revision 387141)
+++ head/www/rubygem-gitlab-grack/Makefile	(revision 387142)
@@ -1,17 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-grack
-PORTVERSION=	1.1.0
+PORTVERSION=	2.0.2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby/Rack Git Smart-HTTP Server Handler
 
-RUN_DEPENDS=	rubygem-rack>=1.4.1:${PORTSDIR}/www/rubygem-rack
+LICENSE=	MIT
 
+RUN_DEPENDS=	rubygem-rack15>=1.5.1:${PORTSDIR}/www/rubygem-rack15
+
+CONFLICTS_INSTALL=	conserver-[0-9]* conserver-com-[0-9]*
+
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+
+PLIST_FILES=	bin/console \
+		bin/testserver
 
 .include <bsd.port.mk>
Index: head/www/rubygem-gitlab-grack/distinfo
===================================================================
--- head/www/rubygem-gitlab-grack/distinfo	(revision 387141)
+++ head/www/rubygem-gitlab-grack/distinfo	(revision 387142)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/gitlab-grack-1.1.0.gem) = 66c888f998882346a5e0913f488d8e463769044ad637f64db15b3ea4206e9209
-SIZE (rubygem/gitlab-grack-1.1.0.gem) = 12288
+SHA256 (rubygem/gitlab-grack-2.0.2.gem) = 1b1505625ce8cd53fbe1675c64b9b277cfea6028141bcec95193031a1ab4995d
+SIZE (rubygem/gitlab-grack-2.0.2.gem) = 13824