Index: head/x11/i3status/Makefile =================================================================== --- head/x11/i3status/Makefile (revision 510160) +++ head/x11/i3status/Makefile (revision 510161) @@ -1,34 +1,32 @@ # $FreeBSD$ PORTNAME= i3status -PORTVERSION= 2.12 +PORTVERSION= 2.13 CATEGORIES= x11 MASTER_SITES= http://i3wm.org/i3status/ MAINTAINER= bapt@FreeBSD.org COMMENT= Small program for generating a status bar LICENSE= BSD3CLAUSE -OPTIONS_DEFINE= PULSEAUDIO - LIB_DEPENDS= libconfuse.so:devel/libconfuse \ libyajl.so:devel/yajl -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake tar:bzip2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= ac_cv_path_PATH_ASCIIDOC=${TRUE} \ + ac_cv_path_PATH_XMLTO=${TRUE} \ + --disable-dependency-tracking +USES= gmake pkgconfig tar:bzip2 +BUILD_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} +INSTALL_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} -PULSEAUDIO_EXTRA_PATCHES_OFF= ${FILESDIR}/no-pulseaudio.diff -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio - post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/i3status.c -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/i3status ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/i3status.1 ${STAGEDIR}${MANPREFIX}/man/man1 +post-install: ${INSTALL_DATA} ${WRKSRC}/i3status.conf \ ${STAGEDIR}${PREFIX}/etc/i3status.conf.sample + .include Index: head/x11/i3status/distinfo =================================================================== --- head/x11/i3status/distinfo (revision 510160) +++ head/x11/i3status/distinfo (revision 510161) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526289145 -SHA256 (i3status-2.12.tar.bz2) = 6fc6881536043391ab4bed369d956f99d1088965d8bcebed18d1932de3ba791a -SIZE (i3status-2.12.tar.bz2) = 57162 +TIMESTAMP = 1564643344 +SHA256 (i3status-2.13.tar.bz2) = ce89c9ff8565f62e88299f1a611229afdfc356b4e97368a5f8c4f06ad2fa1466 +SIZE (i3status-2.13.tar.bz2) = 201409 Index: head/x11/i3status/files/no-pulseaudio.diff =================================================================== --- head/x11/i3status/files/no-pulseaudio.diff (revision 510160) +++ head/x11/i3status/files/no-pulseaudio.diff (nonexistent) @@ -1,25 +0,0 @@ ---- Makefile.orig 2016-01-12 12:26:06 UTC -+++ Makefile -@@ -75,6 +75,11 @@ OBJS:=$(filter-out src/pulse.o, $(OBJS)) - LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread - endif - -+ifeq ($(OS),FreeBSD) -+OBJS:=$(filter-out src/pulse.o, $(OBJS)) -+LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread -+endif -+ - src/%.o: src/%.c include/i3status.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< - @echo " CC $<" ---- src/print_volume.c.orig 2016-01-12 12:27:47 UTC -+++ src/print_volume.c -@@ -60,7 +60,7 @@ void print_volume(yajl_gen json_gen, cha - free(instance); - } - --#ifndef __OpenBSD__ -+#if !defined(__OPENBSD__) && !defined(__FreeBSD__) - /* Try PulseAudio first */ - - /* If the device name has the format "pulse[:N]" where N is the Property changes on: head/x11/i3status/files/no-pulseaudio.diff ___________________________________________________________________ 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/i3status/files/patch-src_print__volume.c =================================================================== --- head/x11/i3status/files/patch-src_print__volume.c (nonexistent) +++ head/x11/i3status/files/patch-src_print__volume.c (revision 510161) @@ -0,0 +1,11 @@ +--- src/print_volume.c.orig 2019-01-23 08:03:56 UTC ++++ src/print_volume.c +@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, con + free(instance); + } + +-#if !defined(__DragonFly__) && !defined(__OpenBSD__) ++#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + /* Try PulseAudio first */ + + /* If the device name has the format "pulse[:N]" where N is the Property changes on: head/x11/i3status/files/patch-src_print__volume.c ___________________________________________________________________ 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 Index: head/x11/i3status/files/patch-src_pulse.c =================================================================== --- head/x11/i3status/files/patch-src_pulse.c (nonexistent) +++ head/x11/i3status/files/patch-src_pulse.c (revision 510161) @@ -0,0 +1,12 @@ +--- src/pulse.c.orig 2019-01-23 08:03:56 UTC ++++ src/pulse.c +@@ -1,3 +1,4 @@ ++#ifndef __FreeBSD__ + // vim:ts=4:sw=4:expandtab + #include + #include +@@ -337,3 +338,4 @@ bool pulse_initialize(void) { + } + return true; + } ++#endif Property changes on: head/x11/i3status/files/patch-src_pulse.c ___________________________________________________________________ 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