aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2018-07-15 09:01:40 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2018-07-15 09:01:40 +0000
commit3bea43c11bb48f2e7fe355f9be3a7a64bbb7a574 (patch)
tree17afdaa7c5be472ee4f2c77ffe7535a61bb9f0c9
parentd43e01f1b46acb2bd3fa44432cad0c3a93359c72 (diff)
downloadports-3bea43c11bb48f2e7fe355f9be3a7a64bbb7a574.tar.gz
ports-3bea43c11bb48f2e7fe355f9be3a7a64bbb7a574.zip
Notes
-rw-r--r--x11-servers/x2x/Makefile22
-rw-r--r--x11-servers/x2x/distinfo5
-rw-r--r--x11-servers/x2x/files/patch-Makefile.am11
-rw-r--r--x11-servers/x2x/files/patch-configure.ac11
4 files changed, 33 insertions, 16 deletions
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index b66004b9d635..4c8940a217fe 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -2,32 +2,26 @@
# $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>
diff --git a/x11-servers/x2x/distinfo b/x11-servers/x2x/distinfo
index 7f02752a8ac9..2e94a57c3b97 100644
--- a/x11-servers/x2x/distinfo
+++ b/x11-servers/x2x/distinfo
@@ -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
diff --git a/x11-servers/x2x/files/patch-Makefile.am b/x11-servers/x2x/files/patch-Makefile.am
new file mode 100644
index 000000000000..cc0bd4ac661a
--- /dev/null
+++ b/x11-servers/x2x/files/patch-Makefile.am
@@ -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
+
diff --git a/x11-servers/x2x/files/patch-configure.ac b/x11-servers/x2x/files/patch-configure.ac
new file mode 100644
index 000000000000..6e364f10bccc
--- /dev/null
+++ b/x11-servers/x2x/files/patch-configure.ac
@@ -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