Index: head/x11-wm/compton/Makefile =================================================================== --- head/x11-wm/compton/Makefile (revision 433443) +++ head/x11-wm/compton/Makefile (revision 433444) @@ -1,76 +1,60 @@ # $FreeBSD$ PORTNAME= compton -PORTVERSION= 20150920 +PORTVERSION= 20160907 CATEGORIES= x11-wm MAINTAINER= femc7488@gmail.com COMMENT= Feature-rich compositing window manager for X11 LICENSE= MIT LIB_DEPENDS= libconfig.so:devel/libconfig RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo 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 ALL_TARGET= ${PORTNAME} OPTIONS_DEFINE= PCRE DRM OPENGL DBUS DOCS OPTIONS_DEFAULT= PCRE DRM OPENGL DBUS PCRE_DESC= Blacklist support (via libpcre) DRM_DESC= DRM support DOCS_DESC= Build manpages (requires AsciiDoc/DocBook) -.include +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 +DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm +DRM_MAKE_ARGS_OFF= NO_VSYNC_DRM=yes -.if ${PORT_OPTIONS:MDRM} -LIB_DEPENDS+= libdrm.so:graphics/libdrm -.else -MAKE_ARGS+= NO_VSYNC_DRM=yes -.endif +OPENGL_USE= GL=gl +OPENGL_MAKE_ARGS_OFF= NO_VSYNC_OPENGL=yes -.if ${PORT_OPTIONS:MOPENGL} -USE_GL= gl -.else -MAKE_ARGS+= NO_VSYNC_OPENGL=yes -.endif +DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus +DBUS_MAKE_ARGS_OFF= NO_DBUS=yes -.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 +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 @${REINPLACE_CMD} -e '/config_system_dir/s|/etc|${LOCALBASE}&|' \ ${WRKSRC}/src/compton.c .include Index: head/x11-wm/compton/distinfo =================================================================== --- head/x11-wm/compton/distinfo (revision 433443) +++ head/x11-wm/compton/distinfo (revision 433444) @@ -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 Index: head/x11-wm/compton/files/patch-c2.h =================================================================== --- head/x11-wm/compton/files/patch-c2.h (revision 433443) +++ head/x11-wm/compton/files/patch-c2.h (nonexistent) @@ -1,15 +0,0 @@ ---- 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 @@ - /// Pointer to a condition tree. - typedef struct { - bool isbranch : 1; -- union { -- c2_b_t *b; -- c2_l_t *l; -- }; -+ c2_b_t *b; -+ c2_l_t *l; - } c2_ptr_t; - - /// Initializer for c2_ptr_t. Property changes on: head/x11-wm/compton/files/patch-c2.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/compton/files/patch-Makefile =================================================================== --- head/x11-wm/compton/files/patch-Makefile (revision 433443) +++ head/x11-wm/compton/files/patch-Makefile (revision 433444) @@ -1,46 +1,47 @@ ---- 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 - a2x --format manpage $< + a2x -v --format manpage $< man/%.1.html: man/%.1.asciidoc asciidoc $< docs: $(MANPAGES) $(MANPAGES_HTML) -install: $(BINS) docs - @install -d "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(MANDIR)" "$(DESTDIR)$(APPDIR)" - @install -m755 $(BINS) "$(DESTDIR)$(BINDIR)"/ -ifneq "$(MANPAGES)" "" - @install -m644 $(MANPAGES) "$(DESTDIR)$(MANDIR)"/ -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" - @install -m644 media/compton.svg "$(DESTDIR)$(ICODIR)/scalable/apps"/ - @install -m644 media/icons/48x48/compton.png "$(DESTDIR)$(ICODIR)/48x48/apps"/ - @install -m644 compton.desktop "$(DESTDIR)$(APPDIR)"/ + install -m644 media/compton.svg "$(DESTDIR)$(ICODIR)/scalable/apps"/ + install -m644 media/icons/48x48/compton.png "$(DESTDIR)$(ICODIR)/48x48/apps"/ + install -m644 compton.desktop "$(DESTDIR)$(APPDIR)"/ + install -m644 compton.sample.conf "$(DESTDIR)$(XDGDIR)"/compton.conf.sample ifneq "$(DOCDIR)" "" - @install -d "$(DESTDIR)$(DOCDIR)" - @install -m644 README.md compton.sample.conf "$(DESTDIR)$(DOCDIR)"/ - @install -m755 dbus-examples/cdbus-driver.sh "$(DESTDIR)$(DOCDIR)"/ + @install -d "$(DESTDIR)$(DOCDIR)" "$(DESTDIR)$(MANDIR)" +ifneq "$(MANPAGES)" "" + install -m644 $(MANPAGES) "$(DESTDIR)$(MANDIR)"/ +endif + install -m644 README.md "$(DESTDIR)$(DOCDIR)"/ + install -m755 dbus-examples/cdbus-driver.sh "$(DESTDIR)$(DOCDIR)"/ endif uninstall: Index: head/x11-wm/compton/files/patch-src_c2.h =================================================================== --- head/x11-wm/compton/files/patch-src_c2.h (nonexistent) +++ head/x11-wm/compton/files/patch-src_c2.h (revision 433444) @@ -0,0 +1,15 @@ +--- 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; +- union { +- c2_b_t *b; +- c2_l_t *l; +- }; ++ c2_b_t *b; ++ c2_l_t *l; + } c2_ptr_t; + + /// Initializer for c2_ptr_t. Property changes on: head/x11-wm/compton/files/patch-src_c2.h ___________________________________________________________________ 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