Index: head/x11-servers/x2x/Makefile
===================================================================
--- head/x11-servers/x2x/Makefile	(revision 474678)
+++ head/x11-servers/x2x/Makefile	(revision 474679)
@@ -1,33 +1,27 @@
 # Created by: grog
 # $FreeBSD$
 
 PORTNAME=	x2x
-PORTVERSION=	1.27
-PORTREVISION=	3
+PORTVERSION=	1.30.20180709
 CATEGORIES=	x11-servers
-MASTER_SITES=	GHC
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to link multiple X servers together
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		autoreconf pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	dottedmag
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-USES=		imake
+GH_TAGNAME=	e62a535
+GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xtst
 
-PLIST_FILES=	bin/x2x man/man1/x2x.1.gz
+OPTIONS_DEFINE=	DOCS
 
-post-extract:
-	@${LN} -sf x2x.1 ${WRKSRC}/x2x.man
+PORTDOCS=	*
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/CC =/s|^|XCOMM| ; \
-		 /CDEBUGFLAGS =/s|^|XCOMM|' ${WRKSRC}/Imakefile
+PLIST_FILES=	bin/x2x man/man1/x2x.1.gz
 
 .include <bsd.port.mk>
Index: head/x11-servers/x2x/distinfo
===================================================================
--- head/x11-servers/x2x/distinfo	(revision 474678)
+++ head/x11-servers/x2x/distinfo	(revision 474679)
@@ -1,2 +1,3 @@
-SHA256 (x2x-1.27.tar.gz) = d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36
-SIZE (x2x-1.27.tar.gz) = 16776
+TIMESTAMP = 1531643384
+SHA256 (dottedmag-x2x-1.30.20180709-e62a535_GH0.tar.gz) = 26f9b43e982a64daf13dcad0be694d4687032e914c3d0b3e9baad8b51f08d41d
+SIZE (dottedmag-x2x-1.30.20180709-e62a535_GH0.tar.gz) = 47678
Index: head/x11-servers/x2x/files/patch-Makefile.am
===================================================================
--- head/x11-servers/x2x/files/patch-Makefile.am	(nonexistent)
+++ head/x11-servers/x2x/files/patch-Makefile.am	(revision 474679)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2018-07-15 08:40:22 UTC
++++ Makefile.am
+@@ -37,7 +37,7 @@ COPYING_FILES += COPYING
+ 
+ lawyerese.c: $(COPYING_FILES)
+ 	echo 'char *lawyerese =' > $@.tmp && \
+-		sed -e 's|.*|"\0\\n"|g' $^ >> $@.tmp && \
++		sed -e 's|.*|"\0\\n"|g' COPYING >> $@.tmp && \
+ 		echo ";" >> $@.tmp && \
+ 		mv $@.tmp $@ || rm -f $@.tmp
+ 

Property changes on: head/x11-servers/x2x/files/patch-Makefile.am
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-servers/x2x/files/patch-configure.ac
===================================================================
--- head/x11-servers/x2x/files/patch-configure.ac	(nonexistent)
+++ head/x11-servers/x2x/files/patch-configure.ac	(revision 474679)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2018-07-15 08:54:28 UTC
++++ configure.ac
+@@ -15,7 +15,7 @@ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
+-AX_CFLAGS_WARN_ALL
++#AX_CFLAGS_WARN_ALL
+ 
+ ## This PKG_CHECK_MODULES can be replaced by the following three
+ ## AC_SEARCH_LIBSs and the non-Cygwin setting of AM_LDFLAGS and

Property changes on: head/x11-servers/x2x/files/patch-configure.ac
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property