Index: branches/2018Q3/devel/e2fsprogs-libss/Makefile
===================================================================
--- branches/2018Q3/devel/e2fsprogs-libss/Makefile	(revision 474358)
+++ branches/2018Q3/devel/e2fsprogs-libss/Makefile	(revision 474359)
@@ -1,32 +1,29 @@
 # Created by: Ben Kaduk <kaduk@mit.edu>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libss
 
 MAINTAINER=	kaduk-fbsd@mit.edu
 COMMENT=	Command-line interface parsing library from e2fsprogs
 
 LICENSE=	MIT
 LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h
-
-CONFLICTS=	heimdal-[0-9]*
-CONFLICTS+=	krb4-[0-9]*
 
 OPTIONS_EXCLUDE=	DOCS EXAMPLES IPV6 NLS
 CONFIGURE_ARGS=	--enable-elf-shlibs
 MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/lib/ss
 INSTALL_WRKSRC=	${WRKSRC}/lib/ss
 FILESDIR=	${.CURDIR}/files
 
 PKGDIR=		${.CURDIR}
 
 pre-build:
 	(cd ${WRKSRC}/lib/ss && compile_et ss_err.et && \
 	${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h)
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 474358)
+++ branches/2018Q3	(revision 474359)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r474328