diff options
| author | Diane Bruce <db@FreeBSD.org> | 2019-10-06 00:22:33 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2019-10-06 00:22:33 +0000 |
| commit | aba6a325e15685967e5e0b6edbd8977a41a503e6 (patch) | |
| tree | d02c3557d20bde1f5021e8ebc01bb88a871e612f /audio/xanalyser | |
| parent | 378f3dc183b86a6c69ba2ed2177130cf7948a383 (diff) | |
| download | ports-aba6a325e15685967e5e0b6edbd8977a41a503e6.tar.gz ports-aba6a325e15685967e5e0b6edbd8977a41a503e6.zip | |
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
Notes
Notes:
svn path=/head/; revision=513859
Diffstat (limited to 'audio/xanalyser')
| -rw-r--r-- | audio/xanalyser/Makefile | 7 | ||||
| -rw-r--r-- | audio/xanalyser/files/patch-src_Makefile.in | 6 | ||||
| -rw-r--r-- | audio/xanalyser/files/patch-xanalyser.spec.in | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 2c7204c5434c..b79798e98d4b 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -1,9 +1,8 @@ -# Created by: Diane Bruce <db@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> diff --git a/audio/xanalyser/files/patch-src_Makefile.in b/audio/xanalyser/files/patch-src_Makefile.in index aa80d44e7e1b..db526ab7a790 100644 --- a/audio/xanalyser/files/patch-src_Makefile.in +++ b/audio/xanalyser/files/patch-src_Makefile.in @@ -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: diff --git a/audio/xanalyser/files/patch-xanalyser.spec.in b/audio/xanalyser/files/patch-xanalyser.spec.in index 9a70d02674ec..09f9572bc1b5 100644 --- a/audio/xanalyser/files/patch-xanalyser.spec.in +++ b/audio/xanalyser/files/patch-xanalyser.spec.in @@ -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 |