diff --git a/audio/zita-jclient/Makefile b/audio/zita-jclient/Makefile index fc09fa5282f2..a3808ba34451 100644 --- a/audio/zita-jclient/Makefile +++ b/audio/zita-jclient/Makefile @@ -1,35 +1,30 @@ PORTNAME= zita-jclient DISTVERSION= 0.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= https://kokkinizita.linuxaudio.org/linuxaudio/downloads/ MAINTAINER= yuri@FreeBSD.org COMMENT= Library to create a Jack client with a few lines of C++ WWW= https://kokkinizita.linuxaudio.org/linuxaudio/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../COPYING LIB_DEPENDS= libjack.so:audio/jack USES= gmake localbase:ldflags pkgconfig tar:bz2 USE_LDCONFIG= yes -ALL_TARGET= libzita-jclient.so.${PORTVERSION} +ALL_TARGET= libzita-jclient.so.${DISTVERSION} WRKSRC_SUBDIR= source PLIST_FILES= include/zita-jclient.h \ lib/libzita-jclient.so \ - lib/libzita-jclient.so.${PORTVERSION} - -OPTIONS_DEFINE= NATIVE - -NATIVE_DESC= Build with native optimizations (-march=native) -NATIVE_MAKE_ARGS= FREEBSD_CXXFLAGS_EXTRA="-march=native" + lib/libzita-jclient.so.${DISTVERSION} post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libzita-jclient.so.${PORTVERSION} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libzita-jclient.so.${DISTVERSION} .include diff --git a/audio/zita-jclient/files/patch-Makefile b/audio/zita-jclient/files/patch-Makefile index 513373343dac..e8b6a5151346 100644 --- a/audio/zita-jclient/files/patch-Makefile +++ b/audio/zita-jclient/files/patch-Makefile @@ -1,31 +1,30 @@ --- Makefile.orig 2018-08-24 18:41:55 UTC +++ Makefile @@ -20,7 +20,7 @@ # Modify as required. # -SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') +SUFFIX := #$(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') PREFIX ?= /usr/local INCDIR ?= $(PREFIX)/include LIBDIR ?= $(PREFIX)/lib$(SUFFIX) -@@ -31,8 +31,8 @@ VERSION = $(MAJVERS).$(MINVERS) +@@ -31,8 +31,7 @@ VERSION = $(MAJVERS).$(MINVERS) CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -CXXFLAGS += -Wall -fPIC -O2 -ffast-math -CXXFLAGS += -march=native -+CXXFLAGS += -Wall -fPIC -ffast-math -+CXXFLAGS += ${FREEBSD_CXXFLAGS_EXTRA} ++CXXFLAGS += -Wall -fPIC LDFLAGS += LDLIBS += -@@ -56,7 +56,7 @@ install: $(ZITA-JCLIENT_MIN) +@@ -56,7 +55,7 @@ install: $(ZITA-JCLIENT_MIN) install -d $(DESTDIR)$(LIBDIR) install -m 644 $(ZITA-JCLIENT_H) $(DESTDIR)$(INCDIR) install -m 755 $(ZITA-JCLIENT_MIN) $(DESTDIR)$(LIBDIR) - ldconfig + #ldconfig ln -sf $(ZITA-JCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-JCLIENT_SO) uninstall: