[150673] trunk/dports/office/zathura-plugin-cb
devans at macports.org
devans at macports.org
Tue Jul 26 08:46:40 PDT 2016
Revision: 150673
https://trac.macports.org/changeset/150673
Author: devans at macports.org
Date: 2016-07-26 08:46:40 -0700 (Tue, 26 Jul 2016)
Log Message:
-----------
zathura-plugin-cb: maintainer update to version 0.1.5 (#51913).
Modified Paths:
--------------
trunk/dports/office/zathura-plugin-cb/Portfile
trunk/dports/office/zathura-plugin-cb/files/patch-Makefile.diff
trunk/dports/office/zathura-plugin-cb/files/patch-config.mk.diff
Modified: trunk/dports/office/zathura-plugin-cb/Portfile
===================================================================
--- trunk/dports/office/zathura-plugin-cb/Portfile 2016-07-26 15:31:33 UTC (rev 150672)
+++ trunk/dports/office/zathura-plugin-cb/Portfile 2016-07-26 15:46:40 UTC (rev 150673)
@@ -2,9 +2,10 @@
# $Id$
PortSystem 1.0
+PortGroup compiler_blacklist_versions 1.0
name zathura-plugin-cb
-version 0.1.4
+version 0.1.5
categories office
platforms darwin
license zlib
@@ -20,10 +21,12 @@
master_sites http://pwmt.org/projects/zathura-cb/download/
distname zathura-cb-${version}
-checksums rmd160 9219ded7822bbfb117b636fd13b57adfe116c4c4 \
- sha256 f21cb140cce02b3ef8b23eff479a7f66285667ab47cdc099c10cd62eaf239626
+checksums rmd160 5e7552e84df9a66000462449d439b2e845515697 \
+ sha256 375f6912bd79648603bad51c3635ce28eaca7bf4df521c00ff9673d9b4ff6afd
-patchfiles patch-Makefile.diff
+patch.pre_args -p1
+patchfiles patch-Makefile.diff \
+ patch-config.mk.diff
depends_build port:pkgconfig
@@ -34,6 +37,9 @@
use_configure no
+# blacklist compilers that don't support -std=c11
+compiler.blacklist *gcc* {clang < 300}
+
variant universal {}
build.args PREFIX=${prefix}
@@ -44,13 +50,13 @@
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
-eval destroot.env ${build.env}
-eval destroot.args ${build.args}
+destroot.env {*}${build.env}
+destroot.args {*}${build.args}
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
livecheck.type regex
-livecheck.url ${master_sites}
+livecheck.url [lindex ${master_sites} 0]
livecheck.regex zathura-cb-(\[0-9.\]+)${extract.suffix}
Modified: trunk/dports/office/zathura-plugin-cb/files/patch-Makefile.diff
===================================================================
--- trunk/dports/office/zathura-plugin-cb/files/patch-Makefile.diff 2016-07-26 15:31:33 UTC (rev 150672)
+++ trunk/dports/office/zathura-plugin-cb/files/patch-Makefile.diff 2016-07-26 15:46:40 UTC (rev 150673)
@@ -1,6 +1,8 @@
---- Makefile.orig 2015-05-27 19:35:19.000000000 -0500
-+++ Makefile 2015-05-27 19:35:39.000000000 -0500
-@@ -20,7 +20,7 @@
+diff --git a/Makefile b/Makefile
+index cdeae8b..26f6377 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ CPPFLAGS += "-DVERSION_MAJOR=${VERSION_MAJOR}"
CPPFLAGS += "-DVERSION_MINOR=${VERSION_MINOR}"
CPPFLAGS += "-DVERSION_REV=${VERSION_REV}"
@@ -9,7 +11,7 @@
zathura-version-check:
ifneq ($(ZATHURA_VERSION_CHECK), 0)
-@@ -48,16 +48,16 @@
+@@ -48,19 +48,19 @@ options:
${OBJECTS}: config.mk zathura-version-check
${DOBJECTS}: config.mk zathura-version-check
@@ -19,17 +21,22 @@
- $(QUIET)${CC} -shared ${LDFLAGS} -o $@ $(OBJECTS) ${LIBS}
+ $(QUIET)${CC} -Wl,-dylib_install_name,${PLUGIN}.dylib -Wl,-bundle_loader,${PREFIX}/bin/zathura -bundle ${LDFLAGS} -o $@ $(OBJECTS) ${LIBS}
- ${PLUGIN}-debug.so: ${DOBJECTS}
+-${PLUGIN}-debug.so: ${DOBJECTS}
++${PLUGIN}-debug.dylib: ${DOBJECTS}
$(ECHO) LD $@
$(QUIET)${CC} -shared ${LDFLAGS} -o $@ $(DOBJECTS) ${LIBS}
clean:
- $(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).so $(PLUGIN)-debug.so \
-+ $(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).dylib $(PLUGIN)-debug.so \
++ $(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).dylib $(PLUGIN)-debug.dylib \
doc .depend ${PROJECT}-${VERSION}.tar.gz zathura-version-check
- debug: options ${PLUGIN}-debug.so
-@@ -77,7 +77,7 @@
+-debug: options ${PLUGIN}-debug.so
++debug: options ${PLUGIN}-debug.dylib
+
+ dist: clean
+ $(QUIET)mkdir -p ${PROJECT}-${VERSION}
+@@ -77,7 +77,7 @@ doc: clean
install: all
$(ECHO) installing ${PLUGIN} plugin
$(QUIET)mkdir -p ${DESTDIR}${PLUGINDIR}
@@ -38,7 +45,7 @@
$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
$(ECHO) installing desktop file
$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX}
-@@ -85,11 +85,11 @@
+@@ -85,11 +85,11 @@ install: all
uninstall:
$(ECHO) uninstalling ${PLUGIN} plugin
Modified: trunk/dports/office/zathura-plugin-cb/files/patch-config.mk.diff
===================================================================
--- trunk/dports/office/zathura-plugin-cb/files/patch-config.mk.diff 2016-07-26 15:31:33 UTC (rev 150672)
+++ trunk/dports/office/zathura-plugin-cb/files/patch-config.mk.diff 2016-07-26 15:46:40 UTC (rev 150673)
@@ -1,34 +1,10 @@
diff --git a/config.mk b/config.mk
-index 63051ad..53bfc29 100644
+index 6f2c912..a45d99a 100644
--- a/config.mk
+++ b/config.mk
-@@ -22,16 +22,19 @@ CAIRO_LIB ?= $(shell pkg-config --libs cairo)
- LIBARCHIVE_INC ?= $(shell pkg-config --cflags libarchive)
- LIBARCHIVE_LIB ?= $(shell pkg-config --libs libarchive)
-
--GLIB_INC ?= $(shell pkg-config --cflags glib-2.0)
--GLIB_LIB ?= $(shell pkg-config --libs glib-2.0)
-+GLIB_INC ?= $(shell pkg-config --cflags glib-2.0 gio-2.0)
-+GLIB_LIB ?= $(shell pkg-config --libs glib-2.0 gio-2.0)
-+
-+GDK_INC ?= $(shell pkg-config --cflags gdk-pixbuf-2.0 gdk-${ZATHURA_GTK_VERSION}.0)
-+GDK_LIB ?= $(shell pkg-config --libs gdk-pixbuf-2.0 gdk-${ZATHURA_GTK_VERSION}.0)
-
- GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk${ZATHURA_GTK_VERSION})
- GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
-
- ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
-
--INCS = ${GIRARA_INC} ${GLIB_INC} ${ZATHURA_INC} ${LIBARCHIVE_INC}
--LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${LIBARCHIVE_LIB}
-+INCS = ${GIRARA_INC} ${GDK_INC} ${GLIB_INC} ${ZATHURA_INC} ${LIBARCHIVE_INC}
-+LIBS = ${GIRARA_LIB} ${GDK_LIB} ${GLIB_LIB} ${LIBARCHIVE_LIB}
-
- # plugindir
- PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
-@@ -42,6 +45,9 @@ endif
+@@ -45,6 +45,9 @@ endif
# flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+ CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+# linker flags
+LDFLAGS += -fPIC -fno-common
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160726/5593c22e/attachment.html>
More information about the macports-changes
mailing list