MFH: r513562

audio/xmradio: Unbreak after libXp deprecation

Unbreak audio/xmradio by not linking against libXp, since it's deprecated.
Add a bunch of missing xorg dependencies.

Approved by:	ports-secteam (joneum)
This commit is contained in:
Niclas Zeising 2019-10-02 10:36:27 +00:00
parent b588a01bb4
commit be443dbc43
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2019Q4/; revision=513566
2 changed files with 5 additions and 6 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= xmradio
PORTVERSION= 1.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://BSDforge.com/projects/source/audio/xmradio/
@ -12,11 +12,10 @@ COMMENT= Motif based FM tuner (for use with bktr(4) driver)
LICENSE= BSD2CLAUSE
BROKEN= /usr/bin/ld: cannot find -lXp
ONLY_FOR_ARCHS= i386 amd64
USES= imake motif
USE_XORG= xpm
USES= imake motif xorg
USE_XORG= ice sm x11 xext xmu xpm xt
PLIST_FILES= bin/xmradio lib/X11/app-defaults/XMradio

View File

@ -5,11 +5,11 @@
#ifdef NetBSDArchitecture
-LOCAL_LIBRARIES = XmClientLibs ${XMULIB} -lXpm -lossaudio -lm
+LOCAL_LIBRARIES = ${MOTIFLIB} ${XTOOLLIB} $(XPLIB) ${XLIB} ${XMULIB} -lXpm -los
+LOCAL_LIBRARIES = ${MOTIFLIB} ${XTOOLLIB} ${XLIB} ${XMULIB} -lXpm -los
+saudio -lm
#else
-LOCAL_LIBRARIES = XmClientLibs ${XMULIB} -lXpm -lm
+LOCAL_LIBRARIES = ${MOTIFLIB} ${XTOOLLIB} $(XPLIB) ${XLIB} ${XMULIB} -lXpm -lm
+LOCAL_LIBRARIES = ${MOTIFLIB} ${XTOOLLIB} ${XLIB} ${XMULIB} -lXpm -lm
EXTRA_LDOPTIONS = -L/usr/local/lib -Wl,-R/usr/local/lib
INCLUDES = -I/usr/local/include