Index: head/x11/i3status/Makefile =================================================================== --- head/x11/i3status/Makefile (revision 405867) +++ head/x11/i3status/Makefile (revision 405868) @@ -1,28 +1,33 @@ # $FreeBSD$ PORTNAME= i3status PORTVERSION= 2.10 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:${PORTSDIR}/devel/libconfuse \ libyajl.so:${PORTSDIR}/devel/yajl CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES= gmake tar:bzip2 + +PULSEAUDIO_EXTRA_PATCHES_OFF= ${FILESDIR}/no-pulseaudio.diff +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/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_DATA} ${WRKSRC}/man/i3status.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/i3status.conf ${STAGEDIR}${PREFIX}/etc/i3status.conf.sample .include Index: head/x11/i3status/files/patch-Makefile =================================================================== --- head/x11/i3status/files/patch-Makefile (revision 405867) +++ head/x11/i3status/files/patch-Makefile (nonexistent) @@ -1,14 +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 $<" Property changes on: head/x11/i3status/files/patch-Makefile ___________________________________________________________________ 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 (revision 405867) +++ head/x11/i3status/files/patch-src_print__volume.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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/patch-src_print__volume.c ___________________________________________________________________ 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/no-pulseaudio.diff =================================================================== --- head/x11/i3status/files/no-pulseaudio.diff (nonexistent) +++ head/x11/i3status/files/no-pulseaudio.diff (revision 405868) @@ -0,0 +1,25 @@ +--- 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 ___________________________________________________________________ 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