- Update `x11-wm/compton' to the latest snapshot

- Add missing X.org libraries to USE_XORG list
- Install stripped binary (subject to WITH_DEBUG)
- Rename wrongly named patch and regenerate them
- Convert to option helpers while I'm at here

4 files changed, 33 insertions, 47 deletions

diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index a61d62b7dee6..87d91a4226af 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	compton
-PORTVERSION=	20150920
+PORTVERSION=	20160907
 CATEGORIES=	x11-wm
 
 MAINTAINER=	femc7488@gmail.com
@@ -15,10 +15,10 @@ RUN_DEPENDS=	xprop:x11/xprop \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chjj
-GH_TAGNAME=	d7f95b5
+GH_TAGNAME=	b7f43ee
 
 USES=		gmake pkgconfig
-USE_XORG=	xcomposite xdamage xrandr xrender xinerama
+USE_XORG=	x11 xcomposite xdamage xext xfixes xrandr xrender xinerama
 
 MAKE_ARGS=	COMPTON_VERSION=git-${PORTVERSION}-${GH_TAGNAME} \
 		XDGDIR=${LOCALBASE}/etc/xdg
@@ -31,42 +31,26 @@ PCRE_DESC=	Blacklist support (via libpcre)
 DRM_DESC=	DRM support
 DOCS_DESC=	Build manpages (requires AsciiDoc/DocBook)
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:devel/pcre
-.else
-MAKE_ARGS+=	NO_REGEX_PCRE=yes
-.endif
-
-.if ${PORT_OPTIONS:MDRM}
-LIB_DEPENDS+=	libdrm.so:graphics/libdrm
-.else
-MAKE_ARGS+=	NO_VSYNC_DRM=yes
-.endif
-
-.if ${PORT_OPTIONS:MOPENGL}
-USE_GL=		gl
-.else
-MAKE_ARGS+=	NO_VSYNC_OPENGL=yes
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:devel/dbus
-.else
-MAKE_ARGS+=	NO_DBUS=yes
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	a2x:textproc/asciidoc \
-		xsltproc:textproc/libxslt \
-		docbook-xml>0:textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-MAKE_ARGS+=	DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1
-ALL_TARGET+=	docs
-PLIST_FILES+=	man/man1/compton.1.gz man/man1/compton-trans.1.gz
-PORTDOCS=	README.md cdbus-driver.sh
-.endif
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PCRE_MAKE_ARGS_OFF=	NO_REGEX_PCRE=yes
+
+DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
+DRM_MAKE_ARGS_OFF=	NO_VSYNC_DRM=yes
+
+OPENGL_USE=		GL=gl
+OPENGL_MAKE_ARGS_OFF=	NO_VSYNC_OPENGL=yes
+
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
+DBUS_MAKE_ARGS_OFF=	NO_DBUS=yes
+
+DOCS_BUILD_DEPENDS=	a2x:textproc/asciidoc \
+			xsltproc:textproc/libxslt \
+			docbook-xml>0:textproc/docbook-xml \
+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+DOCS_MAKE_ARGS=		DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1
+DOCS_ALL_TARGET=	docs
+DOCS_PLIST_FILES=	man/man1/compton.1.gz man/man1/compton-trans.1.gz
+DOCS_PORTDOCS=		README.md cdbus-driver.sh
 
 post-patch:
 # Adjust the location of configuration file
diff --git a/x11-wm/compton/distinfo b/x11-wm/compton/distinfo
index 6c0fda234942..de04afd1ce64 100644
--- a/x11-wm/compton/distinfo
+++ b/x11-wm/compton/distinfo
@@ -1,2 +1,3 @@
-SHA256 (chjj-compton-20150920-d7f95b5_GH0.tar.gz) = 4aa2d3fb8af8fbc7e19d022c708010c68cc13b6616bc550a6089afdc2b821e81
-SIZE (chjj-compton-20150920-d7f95b5_GH0.tar.gz) = 162985
+TIMESTAMP = 1473236624
+SHA256 (chjj-compton-20160907-b7f43ee_GH0.tar.gz) = b03a26effb26763a9a3cb48b2bef849719ab5597493e4d599053c93c33f7c358
+SIZE (chjj-compton-20160907-b7f43ee_GH0.tar.gz) = 163233
diff --git a/x11-wm/compton/files/patch-Makefile b/x11-wm/compton/files/patch-Makefile
index 2250caf8008a..4be2c90fe1d3 100644
--- a/x11-wm/compton/files/patch-Makefile
+++ b/x11-wm/compton/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2015-09-20 09:16:54 UTC
+--- Makefile.orig	2016-09-07 08:23:44 UTC
 +++ Makefile
-@@ -143,29 +143,30 @@ compton: $(OBJS)
+@@ -143,29 +143,31 @@ compton: $(OBJS)
  	$(CC) $(CFG) $(CPPFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
  
  man/%.1: man/%.1.asciidoc
@@ -20,7 +20,8 @@
 -endif
 +install: $(BINS)
 +	@install -d "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(APPDIR)" "$(DESTDIR)$(XDGDIR)"
-+	install -m755 $(BINS) "$(DESTDIR)$(BINDIR)"/
++	install -m755 $(filter-out compton,$(BINS)) "$(DESTDIR)$(BINDIR)"/
++	$(BSD_INSTALL_PROGRAM) compton "$(DESTDIR)$(BINDIR)"/
  	@install -d \
  		"$(DESTDIR)$(ICODIR)/scalable/apps" \
  		"$(DESTDIR)$(ICODIR)/48x48/apps"
diff --git a/x11-wm/compton/files/patch-c2.h b/x11-wm/compton/files/patch-src_c2.h
index 3e5b23825698..60babf307e30 100644
--- a/x11-wm/compton/files/patch-c2.h
+++ b/x11-wm/compton/files/patch-src_c2.h
@@ -1,6 +1,6 @@
---- src/c2.h.orig	2013-02-06 01:40:34.000000000 +0800
-+++ src/c2.h	2013-02-06 01:40:53.000000000 +0800
-@@ -35,10 +35,8 @@
+--- src/c2.h.orig	2016-09-07 08:23:44 UTC
++++ src/c2.h
+@@ -35,10 +35,8 @@ typedef struct _c2_l c2_l_t;
  /// Pointer to a condition tree.
  typedef struct {
    bool isbranch : 1;