svn commit: r513859 - in head/audio/xanalyser: . files
Diane Bruce
db at FreeBSD.org
Sun Oct 6 00:22:34 UTC 2019
Author: db
Date: Sun Oct 6 00:22:33 2019
New Revision: 513859
URL: https://svnweb.freebsd.org/changeset/ports/513859
Log:
libXp is being deprecated.
Also fixed Makefile to properly patch xanalyser.spec.in
Replaced hard coded /usr/local in favour of PREFIX and LOCALBASE as needed
PR: ports/241001
Modified:
head/audio/xanalyser/Makefile
head/audio/xanalyser/files/patch-src_Makefile.in (contents, props changed)
head/audio/xanalyser/files/patch-xanalyser.spec.in (contents, props changed)
Modified: head/audio/xanalyser/Makefile
==============================================================================
--- head/audio/xanalyser/Makefile Sat Oct 5 23:52:02 2019 (r513858)
+++ head/audio/xanalyser/Makefile Sun Oct 6 00:22:33 2019 (r513859)
@@ -1,9 +1,8 @@
-# Created by: Diane Bruce <db at db.net
# $FreeBSD$
PORTNAME= xanalyser
PORTVERSION= 1.32
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio hamradio
MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \
LOCAL/db
@@ -15,7 +14,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake libtool motif tar:bzip2 xorg
-USE_XORG= x11 xmu ice sm xt xp xext
+USE_XORG= x11 xmu ice sm xt xext
GNU_CONFIGURE= yes
PLIST_FILES= bin/xanalyser lib/X11/app-defaults/XAnalyser man/man1/xanalyser.1.gz
@@ -24,6 +23,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-e 's|%%MOTIFLIB%%|${MOTIFLIB} |g' \
-e 's|%%PREFIX%%|${PREFIX}|g' \
- ${WRKSRC}/xanalyser.spec ${WRKSRC}/src/Makefile.in
+ ${WRKSRC}/xanalyser.spec.in ${WRKSRC}/src/Makefile.in
.include <bsd.port.mk>
Modified: head/audio/xanalyser/files/patch-src_Makefile.in
==============================================================================
--- head/audio/xanalyser/files/patch-src_Makefile.in Sat Oct 5 23:52:02 2019 (r513858)
+++ head/audio/xanalyser/files/patch-src_Makefile.in Sun Oct 6 00:22:33 2019 (r513859)
@@ -5,7 +5,7 @@
Trans.h
-xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 \
-+xanalyser_LDADD = -L/usr/local/lib -lXext -L/usr/local/lib -lXm -lXp \
++xanalyser_LDADD = -L%%LOCALBASE%%/lib -lXext -lXm \
+ -lXt -lSM -lICE -lXmu -lXpm -lX11 \
$(FFTWLDADD) $(ALSALDADD)
@@ -16,8 +16,8 @@
install-data-hook:
- mkdir -p $(DESTDIR)/usr/share/X11/app-defaults
- cp XAnalyser.ad $(DESTDIR)/usr/share/X11/app-defaults/XAnalyser
-+ mkdir -p ${DESTDIR}/usr/local/lib/X11/app-defaults
-+ cp XAnalyser.ad ${DESTDIR}/usr/local/lib/X11/app-defaults/XAnalyser
++ mkdir -p ${DESTDIR}/%%LOCALBASE%%/lib/X11/app-defaults
++ cp XAnalyser.ad ${DESTDIR}/%%LOCALBASE%%/lib/X11/app-defaults/XAnalyser
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: head/audio/xanalyser/files/patch-xanalyser.spec.in
==============================================================================
--- head/audio/xanalyser/files/patch-xanalyser.spec.in Sat Oct 5 23:52:02 2019 (r513858)
+++ head/audio/xanalyser/files/patch-xanalyser.spec.in Sun Oct 6 00:22:33 2019 (r513859)
@@ -1,8 +1,11 @@
---- xanalyser.spec.in.orig 2008-12-06 11:50:02 UTC
+--- xanalyser.spec.in.orig 2019-10-05 23:01:18 UTC
+++ xanalyser.spec.in
-@@ -47,6 +47,6 @@ rm -rf $RPM_BUILD_ROOT
+@@ -45,8 +45,8 @@ rm -rf $RPM_BUILD_ROOT
+
+ %files
%defattr (-, root, root)
- /usr/bin/xanalyser
+-/usr/bin/xanalyser
++%%PREFIX%%/bin/xanalyser
%doc %{_mandir}/man1/xanalyser.1.gz
-%config /usr/share/X11/app-defaults/XAnalyser
+%config %%PREFIX%%/lib/X11/app-defaults/XAnalyser
More information about the svn-ports-head
mailing list