svn commit: r433444 - in head/x11-wm/compton: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Feb 5 18:58:02 UTC 2017
Author: danfe
Date: Sun Feb 5 18:58:00 2017
New Revision: 433444
URL: https://svnweb.freebsd.org/changeset/ports/433444
Log:
- 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
Added:
head/x11-wm/compton/files/patch-src_c2.h
- copied, changed from r433443, head/x11-wm/compton/files/patch-c2.h
Deleted:
head/x11-wm/compton/files/patch-c2.h
Modified:
head/x11-wm/compton/Makefile
head/x11-wm/compton/distinfo
head/x11-wm/compton/files/patch-Makefile
Modified: head/x11-wm/compton/Makefile
==============================================================================
--- head/x11-wm/compton/Makefile Sun Feb 5 18:57:59 2017 (r433443)
+++ head/x11-wm/compton/Makefile Sun Feb 5 18:58:00 2017 (r433444)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= compton
-PORTVERSION= 20150920
+PORTVERSION= 20160907
CATEGORIES= x11-wm
MAINTAINER= femc7488 at 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 libpcr
DRM_DESC= DRM support
DOCS_DESC= Build manpages (requires AsciiDoc/DocBook)
-.include <bsd.port.options.mk>
+PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+PCRE_MAKE_ARGS_OFF= NO_REGEX_PCRE=yes
-.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
+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
Modified: head/x11-wm/compton/distinfo
==============================================================================
--- head/x11-wm/compton/distinfo Sun Feb 5 18:57:59 2017 (r433443)
+++ head/x11-wm/compton/distinfo Sun Feb 5 18:58:00 2017 (r433444)
@@ -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
Modified: head/x11-wm/compton/files/patch-Makefile
==============================================================================
--- head/x11-wm/compton/files/patch-Makefile Sun Feb 5 18:57:59 2017 (r433443)
+++ head/x11-wm/compton/files/patch-Makefile Sun Feb 5 18:58:00 2017 (r433444)
@@ -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"
Copied and modified: head/x11-wm/compton/files/patch-src_c2.h (from r433443, head/x11-wm/compton/files/patch-c2.h)
==============================================================================
--- head/x11-wm/compton/files/patch-c2.h Sun Feb 5 18:57:59 2017 (r433443, copy source)
+++ head/x11-wm/compton/files/patch-src_c2.h Sun Feb 5 18:58:00 2017 (r433444)
@@ -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;
More information about the svn-ports-all
mailing list