summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committermiwi <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commitbce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch)
treef5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /audio
parent2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff)
downloadFreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip
FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
Diffstat (limited to 'audio')
-rw-r--r--audio/HVSC-Update/Makefile2
-rw-r--r--audio/arts/Makefile3
-rw-r--r--audio/ascd/Makefile2
-rw-r--r--audio/asmix/Makefile4
-rw-r--r--audio/asmixer/Makefile4
-rw-r--r--audio/autozen/Makefile3
-rw-r--r--audio/autozen/files/patch-Makefile2
-rw-r--r--audio/bmp-faad/Makefile6
-rw-r--r--audio/bmp-flac/Makefile4
-rw-r--r--audio/bmp-mac/Makefile3
-rw-r--r--audio/bmp-modplug/Makefile3
-rw-r--r--audio/coverhunter/Makefile5
-rw-r--r--audio/dagrab/files/patch-aa2
-rw-r--r--audio/dap/Makefile3
-rw-r--r--audio/dap/files/patch-ad2
-rw-r--r--audio/dap/files/patch-ae2
-rw-r--r--audio/dap/files/patch-tooltips-Makefile.linux2
-rw-r--r--audio/denemo/Makefile5
-rw-r--r--audio/dream/Makefile6
-rw-r--r--audio/ecawave/Makefile3
-rw-r--r--audio/ermixer/Makefile8
-rw-r--r--audio/festival+OGI/Makefile4
-rw-r--r--audio/festival+OGI/files/FreeBSD.mak8
-rw-r--r--audio/festival/Makefile2
-rw-r--r--audio/flac123/Makefile3
-rw-r--r--audio/freealut/Makefile2
-rw-r--r--audio/gai-visual-audio/pkg-plist1
-rw-r--r--audio/gdam/Makefile4
-rw-r--r--audio/gkrellmms/Makefile2
-rw-r--r--audio/gkrellmms2/Makefile2
-rw-r--r--audio/gkrellmss/Makefile5
-rw-r--r--audio/gkrellmss2/Makefile6
-rw-r--r--audio/gkrellmvolume/Makefile2
-rw-r--r--audio/gkrellmvolume2/Makefile2
-rw-r--r--audio/glame/Makefile9
-rw-r--r--audio/gmpc/Makefile2
-rw-r--r--audio/gnapster/Makefile8
-rw-r--r--audio/gnome-audio/Makefile3
-rw-r--r--audio/goobox/Makefile3
-rw-r--r--audio/gqradio/Makefile6
-rw-r--r--audio/grip/Makefile7
-rw-r--r--audio/gsm/Makefile2
-rw-r--r--audio/gspeakers/Makefile7
-rw-r--r--audio/hawkvoice/Makefile6
-rw-r--r--audio/hydrogen/Makefile7
-rw-r--r--audio/icegenerator/Makefile2
-rw-r--r--audio/jack-rack/Makefile7
-rw-r--r--audio/last.fm/Makefile2
-rw-r--r--audio/liba52/Makefile2
-rw-r--r--audio/libao/Makefile2
-rw-r--r--audio/libcdaudio/Makefile2
-rw-r--r--audio/libogg/Makefile2
-rw-r--r--audio/libshout/Makefile2
-rw-r--r--audio/libshout2/Makefile2
-rw-r--r--audio/libsidplay/Makefile2
-rw-r--r--audio/libsidplay2/Makefile2
-rw-r--r--audio/libtunepimp-old/Makefile2
-rw-r--r--audio/libtunepimp/Makefile2
-rw-r--r--audio/linux-alsa-lib/Makefile2
-rw-r--r--audio/linux-arts/Makefile2
-rw-r--r--audio/linux-esound/Makefile2
-rw-r--r--audio/linux-f10-alsa-lib/Makefile2
-rw-r--r--audio/linux-f10-arts/Makefile2
-rw-r--r--audio/linux-f10-esound/Makefile2
-rw-r--r--audio/linux-f10-freealut/Makefile2
-rw-r--r--audio/linux-f10-libaudiofile/Makefile2
-rw-r--r--audio/linux-f10-libogg/Makefile2
-rw-r--r--audio/linux-f10-libvorbis/Makefile2
-rw-r--r--audio/linux-f10-openal/Makefile2
-rw-r--r--audio/linux-f8-alsa-lib/Makefile2
-rw-r--r--audio/linux-f8-arts/Makefile2
-rw-r--r--audio/linux-f8-esound/Makefile2
-rw-r--r--audio/linux-f8-freealut/Makefile2
-rw-r--r--audio/linux-f8-libaudiofile/Makefile2
-rw-r--r--audio/linux-f8-libogg/Makefile2
-rw-r--r--audio/linux-f8-libvorbis/Makefile2
-rw-r--r--audio/linux-f8-openal/Makefile2
-rw-r--r--audio/linux-freealut/Makefile2
-rw-r--r--audio/linux-libaudiofile/Makefile2
-rw-r--r--audio/linux-libogg/Makefile2
-rw-r--r--audio/linux-libvorbis/Makefile2
-rw-r--r--audio/linux-openal/Makefile2
-rw-r--r--audio/lmms/Makefile4
-rw-r--r--audio/lplayer/Makefile9
-rw-r--r--audio/mixer.app/Makefile8
-rw-r--r--audio/mixxx/Makefile4
-rw-r--r--audio/mpg123/files/patch-aa4
-rw-r--r--audio/mpiosh/Makefile5
-rw-r--r--audio/musicbox-tag-editor/Makefile6
-rw-r--r--audio/normalize/Makefile1
-rw-r--r--audio/normalize/pkg-plist1
-rw-r--r--audio/openal/Makefile2
-rw-r--r--audio/opmixer/Makefile6
-rw-r--r--audio/pd/Makefile2
-rw-r--r--audio/phatbeat/Makefile3
-rw-r--r--audio/portaudio/Makefile2
-rw-r--r--audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic4
-rw-r--r--audio/prokyon3/Makefile15
-rw-r--r--audio/pulseaudio/Makefile3
-rw-r--r--audio/py-sdl_mixer/Makefile2
-rw-r--r--audio/py-sdl_mixer/files/patch-setup.py8
-rw-r--r--audio/py-taglib/Makefile2
-rw-r--r--audio/py-xmms/Makefile2
-rw-r--r--audio/raop_play/Makefile2
-rw-r--r--audio/rat/Makefile3
-rw-r--r--audio/rat30/files/patch-Makefile_FreeBSD_44
-rw-r--r--audio/rhythmbox-devel/Makefile2
-rw-r--r--audio/rhythmbox/Makefile3
-rw-r--r--audio/rosegarden/Makefile4
-rw-r--r--audio/rsynth/Makefile2
-rw-r--r--audio/sdl_mixer/Makefile4
-rw-r--r--audio/snd/Makefile8
-rw-r--r--audio/sound-juicer/Makefile3
-rw-r--r--audio/spiralloops/Makefile6
-rw-r--r--audio/spiralsynth/Makefile5
-rw-r--r--audio/spiralsynthmodular/Makefile4
-rw-r--r--audio/swami/Makefile6
-rw-r--r--audio/taglib/Makefile2
-rw-r--r--audio/tagtool/Makefile6
-rw-r--r--audio/teamspeak_client/Makefile2
-rw-r--r--audio/terminatorx/Makefile4
-rw-r--r--audio/ufmcontrol-i18n/Makefile2
-rw-r--r--audio/vat/Makefile4
-rw-r--r--audio/wavplay/files/patch-aa2
-rw-r--r--audio/wmcdplay/Makefile2
-rw-r--r--audio/wmfmixer/Makefile3
-rw-r--r--audio/wmfmixer/files/patch-Makefile4
-rw-r--r--audio/wmix/Makefile4
-rw-r--r--audio/wmmixer/Makefile2
-rw-r--r--audio/wmmp3/Makefile5
-rw-r--r--audio/wmrecord/Makefile9
-rw-r--r--audio/wmsmixer/Makefile2
-rw-r--r--audio/wmusic/Makefile3
-rw-r--r--audio/workman/Makefile2
-rw-r--r--audio/wsoundprefs/files/patch-ab2
-rw-r--r--audio/wsoundprefs/pkg-descr14
-rw-r--r--audio/wsoundserver/Makefile5
-rw-r--r--audio/xanalyser/Makefile2
-rw-r--r--audio/xmixer/Makefile4
-rw-r--r--audio/xmms-a52dec/Makefile2
-rw-r--r--audio/xmms-arts_output/Makefile2
-rw-r--r--audio/xmms-crystality/Makefile2
-rw-r--r--audio/xmms-flac/Makefile5
-rw-r--r--audio/xmms-imms/Makefile6
-rw-r--r--audio/xmms-infopipe/Makefile2
-rw-r--r--audio/xmms-jackasyn/Makefile4
-rw-r--r--audio/xmms-mailnotify/Makefile4
-rw-r--r--audio/xmms-modplug/Makefile3
-rw-r--r--audio/xmradio/Makefile2
-rw-r--r--audio/xsidplay/Makefile5
-rw-r--r--audio/xspeakfree/Makefile3
-rw-r--r--audio/xtuner/Makefile2
-rw-r--r--audio/xvmixer/Makefile4
-rw-r--r--audio/xwave/Makefile2
-rw-r--r--audio/zinf/Makefile6
155 files changed, 239 insertions, 305 deletions
diff --git a/audio/HVSC-Update/Makefile b/audio/HVSC-Update/Makefile
index 5e1a052..db6c6f7 100644
--- a/audio/HVSC-Update/Makefile
+++ b/audio/HVSC-Update/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
COMMENT= Update program for the HVSC C= 64 SID tune collection
-BUILD_DEPENDS= imake:${X_IMAKE_PORT}
+BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake
WRKSRC= ${WRKDIR}/${PORTNAME:S/-/_/}_Tool_${PORTVERSION:S/.//g}
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index c7a0bd9..b0c3d23 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -38,8 +38,7 @@ _NO_KDE_FINAL= yes
CFLAGS+= -DHAVE_VASPRINTF
CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
CONFIGURE_TARGET= # empty
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
OPTIONS= ESD "Enable esound support" off \
NAS "Enable NAS support" off
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index 7791288..2147ba9 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -18,7 +18,7 @@ COMMENT= A dockable cd player for AfterStep or WindowMaker
LIB_DEPENDS= workman.1:${PORTSDIR}/audio/libworkman
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
DATAFILES= ascd-0.13pr6-themes.tgz
THEMESDIR= ascd-0.13pr6-themes
diff --git a/audio/asmix/Makefile b/audio/asmix/Makefile
index c4e641f..f9421f9 100644
--- a/audio/asmix/Makefile
+++ b/audio/asmix/Makefile
@@ -17,8 +17,8 @@ COMMENT= Volume control dock-app for the AfterStep Window Manager
USE_XORG= xpm x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm \
- --with-xpm-includes=${X11BASE}/include \
- --with-xpm-library=${X11BASE}/lib
+ --with-xpm-includes=${LOCALBASE}/include \
+ --with-xpm-library=${LOCALBASE}/lib
MAN1= ${PORTNAME}.1x
PLIST_FILES= bin/asmix
diff --git a/audio/asmixer/Makefile b/audio/asmixer/Makefile
index 1801440..25b57e7e 100644
--- a/audio/asmixer/Makefile
+++ b/audio/asmixer/Makefile
@@ -20,8 +20,8 @@ PLIST_FILES= bin/asmixer
USE_XORG= xpm x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm \
- --with-xpm-includes=${X11BASE} \
- --with-xpm-library=${X11BASE}
+ --with-xpm-includes=${LOCALBASE} \
+ --with-xpm-library=${LOCALBASE}
post-install:
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index 006add6..ddf180d 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= autozen
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.springdaemons.com/soft/
@@ -18,7 +18,6 @@ MAKE_ENV+= PTHREAD_FLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" \
DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}"
USE_GNOME= gtk12
-USE_X_PREFIX= yes
USE_PERL5_RUN= yes
PORTDOCS= *
diff --git a/audio/autozen/files/patch-Makefile b/audio/autozen/files/patch-Makefile
index 94857e43..47e2cf0 100644
--- a/audio/autozen/files/patch-Makefile
+++ b/audio/autozen/files/patch-Makefile
@@ -10,7 +10,7 @@
-PREFIX = /usr
-PUBLIC_SEQUENCES = $(PREFIX)/share/AutoZen
-+PREFIX = ${X11BASE}
++PREFIX = ${LOCALBASE}
+PUBLIC_SEQUENCES = $(PREFIX)/share/autozen
# uncomment one of the OS= lines below if you're compiling on one of those OSen.
diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index 61fe0f6..656b9c9 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -7,10 +7,9 @@
PORTNAME= faad2
PORTVERSION= 2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= faac
+MASTER_SITES= SF/faac
PKGNAMEPREFIX= bmp-
MAINTAINER= ahze@FreeBSD.org
@@ -26,7 +25,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOTOOLS= automake:15 autoheader:261 autoconf:261 libtool:15
AUTOMAKE_ARGS= --add-missing
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index 9bf67c6..2711716 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
- --with-xmms-prefix="${X11BASE}"
+ --with-xmms-prefix="${LOCALBASE}"
MAKEFILE= ${FILESDIR}/Makefile
@@ -38,7 +38,7 @@ post-configure:
@${RM} -rf ${WRKSRC}/obj
@${RM} -rf ${WRKSRC}/include/FLAC
-# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/bmp/Input
+# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/Input
do-install:
${INSTALL_DATA} ${WRKSRC}/src/plugin_bmp/.libs/libbmp-flac.so ${PREFIX}/lib/bmp/Input
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 95b88a1..a671f01 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mac
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= CENKES
PKGNAMEPREFIX= bmp-
@@ -18,7 +18,6 @@ COMMENT= Monkey's Audio Codec non-win32 port
LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
mac.2:${PORTSDIR}/audio/mac
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 0d282a7..261fff7 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -7,7 +7,7 @@
PORTNAME= modplug
PORTVERSION= 2.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES?= audio
MASTER_SITES= ftp://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
http://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
@@ -25,7 +25,6 @@ LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_X_PREFIX= yes
HAS_CONFIGURE= yes
PLUGDIR?= lib/bmp/Input
PLIST_FILES= ${PLUGDIR}/libmodplugbmp.so
diff --git a/audio/coverhunter/Makefile b/audio/coverhunter/Makefile
index 8a3e9ae..364a8ef 100644
--- a/audio/coverhunter/Makefile
+++ b/audio/coverhunter/Makefile
@@ -9,15 +9,14 @@ PORTNAME= coverhunter
PORTVERSION= 0.3
PORTREVISION= 3
CATEGORIES= audio graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A program fetching the covers of your digital music albums
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_GNOME= pygtk2
USE_PYTHON= 2.3+
NO_BUILD= yes
diff --git a/audio/dagrab/files/patch-aa b/audio/dagrab/files/patch-aa
index 1dc716f..57b9bab 100644
--- a/audio/dagrab/files/patch-aa
+++ b/audio/dagrab/files/patch-aa
@@ -8,7 +8,7 @@
-PREFIX=/usr/local
-CFLAGS=-Wall -g ${UCD}
+PREFIX?=/usr/local
-+CFLAGS+=${UCD} -DCDDB_PATH=\"${X11BASE}/lib/X11/xmcd/cddb\"
++CFLAGS+=${UCD} -DCDDB_PATH=\"${LOCALBASE}/lib/X11/xmcd/cddb\"
all:dagrab
dagrab:dagrab.o
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 2abffff..55473bd 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -18,8 +18,7 @@ COMMENT= Audio sample editing and processing suite
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
MAKEFILE= Makefile.linux
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAKE_ENV+= OTHER_INCLUDE_DIR=. OTHER_LIBRARY_DIR=.
diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad
index a003d6b..0ebf7a0 100644
--- a/audio/dap/files/patch-ad
+++ b/audio/dap/files/patch-ad
@@ -13,7 +13,7 @@
-X11DIR = /usr/X11R6
-INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
-+X11DIR = ${X11BASE}
++X11DIR = ${LOCALBASE}
+INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
+CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
DEBUG = -g3
diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae
index 437f292..1d8ee1e 100644
--- a/audio/dap/files/patch-ae
+++ b/audio/dap/files/patch-ae
@@ -13,7 +13,7 @@
BACKDIR = ../bak/main
HOMEDIR = $(HOME)
-X11DIR = /usr/X11R6
-+X11DIR = ${X11BASE}
++X11DIR = ${LOCALBASE}
INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
diff --git a/audio/dap/files/patch-tooltips-Makefile.linux b/audio/dap/files/patch-tooltips-Makefile.linux
index 74f1bfa..9ae0900 100644
--- a/audio/dap/files/patch-tooltips-Makefile.linux
+++ b/audio/dap/files/patch-tooltips-Makefile.linux
@@ -5,7 +5,7 @@
# Define where the X11 include files are.
-X11_INCLUDE_DIR = /usr/X11R6/include
-+X11_INCLUDE_DIR = ${X11BASE}/include
++X11_INCLUDE_DIR = ${LOCALBASE}/include
# Uncomment out this line if you do not want debug information included.
# DEBUG = -g -Wall -ansi -pedantic
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index c76d4ce..edf0321 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,14 +7,13 @@
PORTNAME= denemo
PORTVERSION= 0.7.6
+PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Graphical score editor
-USE_XLIB= yes
USE_GNOME= gnometarget gtk20 libxml2
USE_BISON= build
GNU_CONFIGURE= yes
diff --git a/audio/dream/Makefile b/audio/dream/Makefile
index c5a4414..3e5b630 100644
--- a/audio/dream/Makefile
+++ b/audio/dream/Makefile
@@ -6,10 +6,9 @@
PORTNAME= dream
PORTVERSION= 1.6.25
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= drm
+MASTER_SITES= SF/drm
DISTNAME= drm-${PORTVERSION}
MAINTAINER= xride@FreeBSD.org
@@ -21,7 +20,6 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
BROKEN= Needs DRM enabled in FAAD
-USE_X_PREFIX= yes
USE_QT_VER= 3
GNU_CONFIGURE= yes
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include \
diff --git a/audio/ecawave/Makefile b/audio/ecawave/Makefile
index f8701c2..174783c 100644
--- a/audio/ecawave/Makefile
+++ b/audio/ecawave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecawave
PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://ecasound.seul.org/download/
@@ -17,7 +17,6 @@ COMMENT= Simple graphical audio file editor
BUILD_DEPENDS= ${LOCALBASE}/lib/libecasound.a:${PORTSDIR}/audio/ecasound
USE_QT_VER= 3
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile
index c84bb92..5dce6e9 100644
--- a/audio/ermixer/Makefile
+++ b/audio/ermixer/Makefile
@@ -12,8 +12,8 @@ PORTVERSION= 0.8
PORTREVISION= 2
PORTEPOCH= 0
CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
+
MAINTAINER= ports@FreeBSD.org
COMMENT= A command-line, ncurses, and (optional) Qt-GUI OSS audio mixer
@@ -27,8 +27,8 @@ USE_PERL5_BUILD= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${X11BASE}/lib"
-CONFIGURE_ENV+= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
+CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+= CPPFLAGS="${PTHREAD_CFLAGS}"
PLIST_FILES= bin/ermixer
.include <bsd.port.pre.mk>
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index 1075fcd..a626e07 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -38,7 +38,7 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \
PKG_FESTIVAL_BUILD_HOME=${FESTIVAL} \
PKG_FESTIVAL_HOME=${FHOME} \
PKG_COMPILER="${CC}" \
- PKG_X11BASE=${X11BASE} \
+ PKG_LOCALBASE=${LOCALBASE} \
PKG_PREFIX=${PREFIX} \
GCC27_CC="${CC}" \
GCC27_CXX="${CXX}" \
@@ -77,7 +77,7 @@ post-patch:
${SPEECHTOOLS}/config/systems/${FESTIVAL_ARCH}_FreeBSD${ii}.${jj}.mak
.endfor
.endfor
- @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \
+ @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
${WRKSRC}/speech_tools/config/systems/default.mak
do-install:
diff --git a/audio/festival+OGI/files/FreeBSD.mak b/audio/festival+OGI/files/FreeBSD.mak
index 26854d2..9def3f8 100644
--- a/audio/festival+OGI/files/FreeBSD.mak
+++ b/audio/festival+OGI/files/FreeBSD.mak
@@ -5,11 +5,11 @@ ECHO_N = /usr/bin/printf "%s"
NAWK=awk
-NAS_LIB=$(PKG_X11BASE)/lib
-NAS_INCLUDE=$(PKG_X11BASE)/include
+NAS_LIB=$(PKG_LOCALBASE)/lib
+NAS_INCLUDE=$(PKG_LOCALBASE)/include
-X11_LIB=$(PKG_X11BASE)/lib
-X11_INCLUDE=$(PKG_X11BASE)/include
+X11_LIB=$(PKG_LOCALBASE)/lib
+X11_INCLUDE=$(PKG_LOCALBASE)/include
OS_INCLUDES+=-I$(PKG_PREFIX)/include
OS_LIBS+=-L$(PKG_PREFIX)/lib
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 1fd9920..00d0fe7 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -50,7 +50,7 @@ post-build test:
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/speech_tools test
post-patch::
- ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \
+ ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
${WRKSRC}/*/config/systems/default.mak
.include <bsd.port.pre.mk>
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index aee7328..ccff480 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -9,8 +9,7 @@ PORTNAME= flac123
PORTVERSION= 0.0.11
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= flac-tools
+MASTER_SITES= SF/flac-tools
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Command-line player for flac audio files
diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index 63b37ad..d88aafc 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/audio/gai-visual-audio/pkg-plist b/audio/gai-visual-audio/pkg-plist
index dff446d..7721e81 100644
--- a/audio/gai-visual-audio/pkg-plist
+++ b/audio/gai-visual-audio/pkg-plist
@@ -3,5 +3,4 @@ libdata/bonobo/servers/GNOME_gai-vaApplet.server
share/pixmaps/gai-va-icon.png
share/pixmaps/gai-va/va.png
@dirrm share/pixmaps/gai-va
-@cwd %%X11BASE%%
lib/xmms/Visualization/spec_plugin.so
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 5f1cd87..9cf249b 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pav@FreeBSD.org
COMMENT= DJ mixing software suitable for live performances
-BUILD_DEPENDS= ${X11BASE}/include/xmms/plugin.h:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS= ${LOCALBASE}/include/xmms/plugin.h:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
MAN1= gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server.1
@@ -23,7 +23,7 @@ MAN1= gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server
USE_GMAKE= yes
USE_GNOME= libglade
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|`$$XMMS_CONFIG --libs`|"`$$XMMS_CONFIG --libs` ${PTHREAD_LIBS}"|' ${WRKSRC}/configure
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index be25856..5a93733 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ume@FreeBSD.org
COMMENT= GKrellM XMMS Plugin
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 666acbd..66f3d68 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/
MAINTAINER= ume@FreeBSD.org
COMMENT= GKrellM XMMS Plugin
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
LATEST_LINK= gkrellmms2
diff --git a/audio/gkrellmss/Makefile b/audio/gkrellmss/Makefile
index 2634734..5e0e9bf 100644
--- a/audio/gkrellmss/Makefile
+++ b/audio/gkrellmss/Makefile
@@ -14,17 +14,16 @@ MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/
MAINTAINER= ports@FreeBSD.org
COMMENT= A plugin for GKrellM with a VU meter showing left/right channel audio
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
LIB_DEPENDS= gdk_pixbuf_xlib.2:${PORTSDIR}/graphics/gdk-pixbuf
LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
NO_LATEST_LINK= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= esound imlib
-USE_XPM= yes
+USE_XORG= xpm
DOC_FILES= Changelog README Themes
diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile
index 6045243..2f6ba15 100644
--- a/audio/gkrellmss2/Makefile
+++ b/audio/gkrellmss2/Makefile
@@ -7,18 +7,18 @@
PORTNAME= gkrellmss
PORTVERSION= 2.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellmss/
MAINTAINER= ports@FreeBSD.org
COMMENT= A plugin for GKrellM with a VU meter showing left/right channel audio
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_GNOME= esound gtk20
USE_GCC= 3.4+
USE_GMAKE= yes
diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile
index 87cee1f..b23b574 100644
--- a/audio/gkrellmvolume/Makefile
+++ b/audio/gkrellmvolume/Makefile
@@ -15,7 +15,7 @@ DISTNAME= volume-${PORTVERSION}
MAINTAINER= ume@FreeBSD.org
COMMENT= GKrellM volume plugin
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
WRKSRC= ${WRKDIR}/volume
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index 2307e58..c62b955 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -16,7 +16,7 @@ DISTNAME= gkrellm-volume-${PORTVERSION}
MAINTAINER= ume@FreeBSD.org
COMMENT= GKrellM volume plugin
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
LATEST_LINK= gkrellmvolume2
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 9795f9a..6644e58 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,10 +7,9 @@
PORTNAME= glame
PORTVERSION= 2.0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME
@@ -21,10 +20,8 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
vorbis.4:${PORTSDIR}/audio/libvorbis \
guile.18:${PORTSDIR}/lang/guile
-USE_XORG= xbitmaps
-USE_XLIB= yes
+USE_XORG= xbitmaps x11
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
-USE_GCC= 3.4+
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl:15 libtool:15
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 0d59475..3b8c46c 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc
PORTVERSION= 0.15.5.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/gmpc-${PORTVERSION:C/\.0$//}/ \
@@ -19,6 +20,7 @@ LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd \
curl.4:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
+USE_XORG= x11 sm
USE_GMAKE= yes
USE_GNOME= libglade2 gnomevfs2 gnomehack
USE_GETTEXT= yes
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index ee1b231..2228558 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -7,22 +7,20 @@
PORTNAME= gnapster
PORTVERSION= 1.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnapster
+MASTER_SITES= SF/gnapster
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME client for the online mp3 community called napster
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GNOME= imlib
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.pre.mk>
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 57f9dfb..4fe194c 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-audio
PORTVERSION= 2.22.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
@@ -15,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Sound files for use with GNOME 2
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11
NO_BUILD= yes
USE_GNOME= gnomehack gnomeprefix gnomehier
MAKE_ENV= prefix=${PREFIX}
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 0cafa57..fbf8c4d 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -8,6 +8,7 @@
PORTNAME= goobox
PORTVERSION= 1.9.2
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,7 +19,7 @@ COMMENT= CD player and ripper for GNOME Desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-USE_XLIB= yes
+USE_XORG= x11
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 8d6db65..868cad1 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,15 +7,13 @@
PORTNAME= gqradio
PORTVERSION= 1.9.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=gqmpeg
+MASTER_SITES= SF/gqmpeg
MAINTAINER= stefan.jahn@nemesis-sektor.de
COMMENT= GTK2 based FM tuner
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 7979fd2..8a14c90 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -7,10 +7,9 @@
PORTNAME= grip
PORTVERSION= 3.2.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GTK front-end to external cd rippers and audio encoders
@@ -19,7 +18,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
curl.4:${PORTSDIR}/ftp/curl
PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
-USE_XLIB= yes
+USE_XORG= x11
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 6a3e522..1a3d078 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -20,7 +20,7 @@ COMMENT= Audio converter and library for converting u-law to gsm encoding
WRKSRC= ${WRKDIR}/gsm-1.0-pl12
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= toast.1
MAN3= gsm.3 gsm_explode.3 gsm_option.3 gsm_print.3
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index afd7b23..a6d5786 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -7,18 +7,15 @@
PORTNAME= gspeakers
PORTVERSION= 0.11
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome-based loudspeaker design program
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-USE_XLIB= yes
-USE_GCC= 3.4+
USE_GNOME= gnomeprefix gnometarget libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= automake:19:env
diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile
index 4c2ec7e..6963e30 100644
--- a/audio/hawkvoice/Makefile
+++ b/audio/hawkvoice/Makefile
@@ -18,10 +18,10 @@ USE_ZIP= yes
USE_DOS2UNIX= yes
USE_GMAKE= yes
MAKEFILE= makefile.linux
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include
MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \
LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
MAKE="${GMAKE}"
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index f632280..6ab9a5a 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hydrogen
PORTVERSION= 0.9.3
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= jylefort@FreeBSD.org
COMMENT= An advanced drum machine
@@ -20,8 +19,8 @@ LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile
GNU_CONFIGURE= yes
USE_QT_VER= 3
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
ac_qmake="${LOCALBASE}/bin/qmake" \
ac_libraries="${LDFLAGS}"
diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile
index 44c10a5..91d9838 100644
--- a/audio/icegenerator/Makefile
+++ b/audio/icegenerator/Makefile
@@ -17,7 +17,7 @@ COMMENT= Direct streaming generator for Icecast/Shoutcast
LIB_DEPENDS= shout.5:${PORTSDIR}/audio/libshout2
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 1d5e106..9a26b4f 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jack-rack
PORTVERSION= 1.4.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jack-rack
+MASTER_SITES= SF/jack-rack
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A LADSPA effects rack for the JACK audio server
@@ -23,8 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
USE_BZIP2= yes
USE_GNOME= libgnomeui libxml2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-ladcca --disable-lash
post-patch:
diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile
index 428e080..95f6e27 100644
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -23,8 +23,6 @@ QT_COMPONENTS= gui imageformats_run moc_build network qmake_build rcc_build \
sql uic_build xml
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= X11BASE=${X11BASE}
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 914db5c..c9feadb 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-oss --enable-shared
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index afab0b6..8b16634 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool:15
WANT_GNOME= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if defined(NOPORTDOCS)
MAKE_ENV= DOC=""
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index d175f5d..0bd3791 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -18,6 +18,6 @@ COMMENT= A library for playing audio CDs
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 5e0c44e..a5cd103 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -17,7 +17,7 @@ COMMENT= Ogg bitstream library
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if defined(NOPORTDOCS)
MAKE_ENV= DOC=""
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index febd999e..12d8d92 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -17,7 +17,7 @@ CONFLICTS= libshout2-*
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.include <bsd.port.mk>
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 6a2f27e..ad10c53 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME+= pkgconfig
GNU_CONFIGURE= yes
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index c417a73..9e4dcd3 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= sec@42.org
COMMENT= A Commodore SID-chip emulator library to play SID music files
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 03f583b..ce671e2 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -24,7 +24,7 @@ LIBTOOLFILES= builders/hardsid-builder/configure \
libsidplay/configure \
libsidutils/configure \
resid/configure
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 329aff5..fe8df30 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -33,7 +33,7 @@ USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/tunepimp-0.4
USE_LDCONFIG= ${PREFIX}/lib/tunepimp-0.4
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 2f4852e..e358204 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -32,7 +32,7 @@ USE_GNOME= gnomehack gnometarget pkgconfig
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
diff --git a/audio/linux-alsa-lib/Makefile b/audio/linux-alsa-lib/Makefile
index 3fdff0b..866bafb 100644
--- a/audio/linux-alsa-lib/Makefile
+++ b/audio/linux-alsa-lib/Makefile
@@ -16,7 +16,7 @@ COMMENT= The Advanced Linux Sound Architecture libraries
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
BRANDELF_DIRS= usr/bin
diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile
index dc6c9be..e3f47be 100644
--- a/audio/linux-arts/Makefile
+++ b/audio/linux-arts/Makefile
@@ -15,7 +15,7 @@ COMMENT= Audio system for the KDE integrated X11 desktop (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST= yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 317e55b..0eb54ae 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-liba
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}"
diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index 3fdff0b..866bafb 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -16,7 +16,7 @@ COMMENT= The Advanced Linux Sound Architecture libraries
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
BRANDELF_DIRS= usr/bin
diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile
index dc6c9be..e3f47be 100644
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -15,7 +15,7 @@ COMMENT= Audio system for the KDE integrated X11 desktop (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST= yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 317e55b..0eb54ae 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-liba
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}"
diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile
index 40d7d76..2ae7123 100644
--- a/audio/linux-f10-freealut/Makefile
+++ b/audio/linux-f10-freealut/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALL_SHLIB= yes
+USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index 6d86912..afcbcbf7 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -16,7 +16,7 @@ COMMENT= RPM of audiofile
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}"
diff --git a/audio/linux-f10-libogg/Makefile b/audio/linux-f10-libogg/Makefile
index 6498543..8733606 100644
--- a/audio/linux-f10-libogg/Makefile
+++ b/audio/linux-f10-libogg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Ogg bitstream library (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index 10c99cb..df3c7fd 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 054a9f7..961205c 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f8-alsa-lib/Makefile b/audio/linux-f8-alsa-lib/Makefile
index 3fdff0b..866bafb 100644
--- a/audio/linux-f8-alsa-lib/Makefile
+++ b/audio/linux-f8-alsa-lib/Makefile
@@ -16,7 +16,7 @@ COMMENT= The Advanced Linux Sound Architecture libraries
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
BRANDELF_DIRS= usr/bin
diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile
index dc6c9be..e3f47be 100644
--- a/audio/linux-f8-arts/Makefile
+++ b/audio/linux-f8-arts/Makefile
@@ -15,7 +15,7 @@ COMMENT= Audio system for the KDE integrated X11 desktop (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST= yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 317e55b..0eb54ae 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-liba
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}"
diff --git a/audio/linux-f8-freealut/Makefile b/audio/linux-f8-freealut/Makefile
index 40d7d76..2ae7123 100644
--- a/audio/linux-f8-freealut/Makefile
+++ b/audio/linux-f8-freealut/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALL_SHLIB= yes
+USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile
index 6d86912..afcbcbf7 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -16,7 +16,7 @@ COMMENT= RPM of audiofile
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}"
diff --git a/audio/linux-f8-libogg/Makefile b/audio/linux-f8-libogg/Makefile
index 6498543..8733606 100644
--- a/audio/linux-f8-libogg/Makefile
+++ b/audio/linux-f8-libogg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Ogg bitstream library (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile
index 10c99cb..df3c7fd 100644
--- a/audio/linux-f8-libvorbis/Makefile
+++ b/audio/linux-f8-libvorbis/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 054a9f7..961205c 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile
index 40d7d76..2ae7123 100644
--- a/audio/linux-freealut/Makefile
+++ b/audio/linux-freealut/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALL_SHLIB= yes
+USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile
index 6d86912..afcbcbf7 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -16,7 +16,7 @@ COMMENT= RPM of audiofile
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}"
diff --git a/audio/linux-libogg/Makefile b/audio/linux-libogg/Makefile
index 6498543..8733606 100644
--- a/audio/linux-libogg/Makefile
+++ b/audio/linux-libogg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Ogg bitstream library (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile
index 10c99cb..df3c7fd 100644
--- a/audio/linux-libvorbis/Makefile
+++ b/audio/linux-libvorbis/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 054a9f7..961205c 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index f7c444d..78c3259 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -31,8 +31,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:261 autoheader:261 automake:19 aclocal:19 libtool:15
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-vst --without-stk
diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile
index 8fa65b9..b66321a 100644
--- a/audio/lplayer/Makefile
+++ b/audio/lplayer/Makefile
@@ -9,10 +9,9 @@
PORTNAME= lplayer
PORTVERSION= 1.01
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -23,12 +22,12 @@ LIB_DEPENDS= db_cxx-4.3.0:${PORTSDIR}/databases/db43 \
WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_XORG= x11 xinerama
USE_QT_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-xmms-prefix=${X11BASE} --with-xinerama \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS= --with-xmms-prefix=${LOCALBASE} --with-xinerama
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 31efd39..a8573ea 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mixer.app
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -17,11 +17,11 @@ COMMENT= Another mixer intended for the windowmaker dockapp
PLIST_FILES= bin/Mixer.app
WRKSRC= ${WRKDIR}/Mixer.app-${PORTVERSION}
-CXXFLAGS+= -fno-rtti -fno-exceptions -I${X11BASE}/include
-LDFLAGS+= -L${X11BASE}/lib -lXpm -lXext -lX11
+CXXFLAGS+= -fno-rtti -fno-exceptions -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lXext -lX11
MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_XPM= yes
+USE_XORG= xpm xext x11
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Mixer.app ${PREFIX}/bin
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index ec84de7..b4b0003 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -48,10 +48,10 @@ post-patch:
s|$$QTDIR/bin/qmake|${LOCALBASE}/bin/qmake|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} \
- -e 's|system( ld|& -shared -L${LOCALBASE}/lib -L${X11BASE}/lib|' \
+ -e 's|system( ld|& -shared -L${LOCALBASE}/lib|' \
${CONFIGURE_WRKSRC}/check.qbas
@${REINPLACE_CMD} \
- -e 's|/usr/local|${LOCALBASE}|; s|/opt|${X11BASE}|' \
+ -e 's|/usr/local|${LOCALBASE}|; s|/opt|${LOCALBASE}|' \
${CONFIGURE_WRKSRC}/paths.qbas
.if !defined(NOPORTDOCS)
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index c5f2305..52d06c4 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -67,8 +67,8 @@
+CFLAGS +=-I${LOCALBASE}/include
+LDFLAGS+=-L${LOCALBASE}/lib
+.elif defined(HAVE_NAS)
-+CFLAGS +=-I${X11BASE}/include -DNAS
-+LDFLAGS+=-L${X11BASE}/lib
++CFLAGS +=-I${LOCALBASE}/include -DNAS
++LDFLAGS+=-L${LOCALBASE}/lib
+.endif
+
freebsd:
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index ad7be61..329def8 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mpiosh
PORTVERSION= 0.7.1.p2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mpio
+MASTER_SITES= SF/mpio
DISTNAME= mpio-${PORTVERSION:S|.p|_pre|}
MAINTAINER= ports@FreeBSD.org
@@ -20,7 +19,7 @@ LIB_DEPENDS= usb-0.1:${PORTSDIR}/devel/libusb
USE_AUTOTOOLS= libtool:15
USE_ICONV= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET=
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 13b6395..10be765 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -8,10 +8,9 @@
PORTNAME= musicbox-tag-editor
PORTVERSION= 0.2.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= musicbox
+MASTER_SITES= SF/musicbox
DISTNAME= musicbox-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -19,7 +18,6 @@ COMMENT= A simple GTK+ audio tag editor
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
-USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix libglade2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 1d4b30a..f12f6fd 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -36,7 +36,6 @@ OPTIONS= XMMS "Build XMMS plugin" off \
.if defined(WITH_XMMS)
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
PLIST_SUB+= XMMS=""
-PLIST_SUB+= X11BASE="${X11BASE}"
.else
CONFIGURE_ARGS+=--disable-xmms
PLIST_SUB+= XMMS="@comment "
diff --git a/audio/normalize/pkg-plist b/audio/normalize/pkg-plist
index 203d150..2fa30b9 100644
--- a/audio/normalize/pkg-plist
+++ b/audio/normalize/pkg-plist
@@ -3,6 +3,5 @@ bin/normalize-mp3
bin/normalize-ogg
%%NLS%%share/locale/en_GB/LC_MESSAGES/normalize.mo
%%NLS%%share/locale/fr/LC_MESSAGES/normalize.mo
-@cwd %%X11BASE%%
%%XMMS%%lib/xmms/Effect/librva.la
%%XMMS%%lib/xmms/Effect/librva.so
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index cbf029f..993f7c0 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --enable-capture
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
WANT_SDL= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
OPTIONS= ARTS "aRts backend" off \
ESD "esd backend" off \
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index bf9cedd..f7f314b 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -7,10 +7,9 @@
PORTNAME= opmixer
PORTVERSION= 0.75
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= optronic
+MASTER_SITES= SF/optronic
DISTNAME= opMixer-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -19,7 +18,6 @@ COMMENT= Adjusts a mixer
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12 gnometarget
GNU_CONFIGURE= yes
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 8f43e72..546061d 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -17,7 +17,7 @@ COMMENT= MIDI-capable real-time audio processor/synthesizer
WRKSRC= ${WRKDIR}/${DISTNAME:S;.src;/src;}
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include \
+CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \
-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
MAKEFILE= makefile
diff --git a/audio/phatbeat/Makefile b/audio/phatbeat/Makefile
index f6ffb9d..6836093 100644
--- a/audio/phatbeat/Makefile
+++ b/audio/phatbeat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phatbeat
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.postreal.org/files/
DISTNAME= PhatBeat-${PORTVERSION}
@@ -15,7 +15,6 @@ DISTNAME= PhatBeat-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A beat counter
-USE_X_PREFIX= yes
USE_SDL= sdl image
MAN1= phatbeat.1
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index e0d84a7..a0f19f5 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -18,7 +18,7 @@ COMMENT= Portable cross-platform Audio API
USE_ZIP= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION}
SHLIB_VERSION= 0
diff --git a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
index d69aee4..489ded2 100644
--- a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
+++ b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
@@ -5,10 +5,10 @@
# Paul Boersma, January 31, 2007
-CC = gcc -std=gnu99 -DUNIX -Dlinux -I /usr/X11R6/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O
-+CC += -std=gnu99 -DUNIX -Dlinux -I${X11BASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized
++CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized
-LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm
-+LIBS = ${X11BASE}/lib/libXm.a -L${X11BASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm
++LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm
RANLIB = ls
ICON =
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index 647dc71..ea2e96f 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -7,30 +7,29 @@
PORTNAME= prokyon3
PORTVERSION= 0.9.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Prokyon3 is a multithreaded MP3 manager and tag editor
-BUILD_DEPENDS= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin
+BUILD_DEPENDS= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin
LIB_DEPENDS= id3-3.8:${PORTSDIR}/audio/id3lib \
vorbis.4:${PORTSDIR}/audio/libvorbis
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
+USE_XORG= x11 xft
USE_QT_VER= 3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_MYSQL= yes
USE_PERL5_BUILD=yes
-CONFIGURE_ARGS+=--with-qtdir=${X11BASE} --with-id3-libs=${LOCALBASE}\
- --with-ogg-libs=${LOCALBASE} --with-vorbis-libs=${LOCALBASE} \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=--with-qtdir=${LOCALBASE} --with-id3-libs=${LOCALBASE}\
+ --with-ogg-libs=${LOCALBASE} --with-vorbis-libs=${LOCALBASE}
QT_NONSTANDARD= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include \
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \
-I${QT_PREFIX}/include" LDFLAGS="${LDFLAGS}"
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 930d76e..1685737 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pulseaudio
PORTVERSION= 0.9.10
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
@@ -18,7 +19,7 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \
oil-0.3.0:${PORTSDIR}/devel/liboil
USE_GNOME= gnometarget gnomehack glib20 ltverhack
-USE_XLIB= yes
+USE_XORG= x11 sm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl:15 libtool:15
diff --git a/audio/py-sdl_mixer/Makefile b/audio/py-sdl_mixer/Makefile
index a696af7..46e8bc5 100644
--- a/audio/py-sdl_mixer/Makefile
+++ b/audio/py-sdl_mixer/Makefile
@@ -30,8 +30,6 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-sdl-mixer
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/setup.py
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/setup.py
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/py-sdl_mixer/files/patch-setup.py b/audio/py-sdl_mixer/files/patch-setup.py
index 2825bbe..a199e85 100644
--- a/audio/py-sdl_mixer/files/patch-setup.py
+++ b/audio/py-sdl_mixer/files/patch-setup.py
@@ -1,19 +1,17 @@
---- setup.py.orig Fri Oct 28 00:13:10 2005
-+++ setup.py Fri Oct 28 00:14:18 2005
-@@ -17,12 +17,14 @@
+--- ./setup.py.orig 2005-07-29 16:16:50.000000000 +0200
++++ ./setup.py 2008-04-13 21:35:05.000000000 +0200
+@@ -17,12 +17,12 @@
INCDIR = [
"/usr/include",
- "/usr/local/include",
+ "%%LOCALBASE%%/include",
-+ "%%X11BASE%%/include",
"/sw/include", # For Mac OS X
]
LIBDIR = [
"/usr/lib",
- "/usr/local/lib",
+ "%%LOCALBASE%%/lib",
-+ "%%X11BASE%%/lib",
"/sw/lib/", # For Mac OS X
]
diff --git a/audio/py-taglib/Makefile b/audio/py-taglib/Makefile
index a5d1ed2..9579ad0 100644
--- a/audio/py-taglib/Makefile
+++ b/audio/py-taglib/Makefile
@@ -24,6 +24,6 @@ USE_PYTHON= -2.4
USE_PYTHON_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index e474d50..f593be8 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -24,7 +24,7 @@ USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= pyxmms
USE_BZIP2= yes
USE_GNOME= glib12
-XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
+XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config
MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}"
.include <bsd.port.mk>
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index 1937301..12b8394 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321 \
flac:${PORTSDIR}/audio/flac
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
USE_GNOME= glib20
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 70db2f2..b750d98 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -19,8 +19,7 @@ USE_TK= yes
USE_XORG= x11 xext sm ice
USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
-CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
- --enable-ipv6
+CONFIGURE_ARGS= --enable-ipv6
MAN1= rat.1
MANCOMPRESSED= no
diff --git a/audio/rat30/files/patch-Makefile_FreeBSD_4 b/audio/rat30/files/patch-Makefile_FreeBSD_4
index 61d2025..d4a838d 100644
--- a/audio/rat30/files/patch-Makefile_FreeBSD_4
+++ b/audio/rat30/files/patch-Makefile_FreeBSD_4
@@ -3,7 +3,7 @@
@@ -0,0 +1,6 @@
+TCL_INC = ${LOCALBASE}/include/tcl8.2
+TK_INC = ${LOCALBASE}/include/tk8.2
-+INCS = -I${X11BASE}/include \
++INCS = -I${LOCALBASE}/include \
+ -I$(TCL_INC)/generic -I$(TK_INC)/generic
+LDLIBS = -L${LOCALBASE}/lib \
-+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm
++ -L${LOCALBASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index f355553..d840a9e 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= rhythmbox
PORTVERSION= 0.11.5
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11
@@ -27,7 +28,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
NO_LATEST_LINK= yes
USE_BZIP2= yes
-USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index fa03846..bcfdeeb 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rhythmbox
PORTVERSION= 0.10.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
@@ -26,7 +26,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index d0f6b20..d82e6bc 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rosegarden
PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.cannam.demon.co.uk/rosegarden/distribution/
DISTNAME= ${PORTNAME}-2.1pl2
@@ -18,7 +18,7 @@ COMMENT= The Rosegarden Editor and Sequencer suite
BUILD_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
-USE_X_PREFIX= yes
+USE_XORG= xaw
USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 77a4759..fdc6635 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -18,8 +18,6 @@ LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm \
audio:${PORTSDIR}/audio/nas
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
pre-configure:
@${CP} ${FILESDIR}/freebsdplay.c ${WRKSRC}/config/freebsdplay.c
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 08619b5..3566369 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -20,8 +20,8 @@ USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\"
USE_LDCONFIG= yes
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 09213a7..6ec9ab7 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,10 +7,9 @@
PORTNAME= snd
PORTVERSION= 7.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Multitracking sound editor and utilities
@@ -54,8 +53,7 @@ CONFIGURE_ARGS+= --with-gtk \
--with-gtkrc-colors \
--with-float-samples
USE_GNOME= gtk20
-USE_X_PREFIX= yes
-USE_XLIB= yes
+USE_XORG= x11
.endif
.include <bsd.port.pre.mk>
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 0f1b7ae..f3fdfea 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sound-juicer
PORTVERSION= 2.22.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +23,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_XLIB= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 33e56e0..28f0ffe 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spiralloops
PORTVERSION= 2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/
DISTNAME= SpiralLoops-${PORTVERSION}
@@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
PLIST= ${WRKDIR}/pkg-plist
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.pre.mk>
@@ -33,12 +32,11 @@ post-patch:
${SED} -E "s:-ldl::g; \
s:^CFLAGS:XCFLAGS:g; \
s:^CXXFLAGS:XCXXFLAGS:g; \
- s:usr/X11R6:${PREFIX}:g; \
s:-O3:${PTHREAD_CFLAGS}:g; \
s:CFLAGS =:CFLAGS +=:g; \
s:CXXFLAGS=:CXXFLAGS+=:g; \
s:-lm:${PTHREAD_LIBS} -lm:g; \
- s:/usr/X11R6:${X11BASE}:g" \
+ s:/usr/X11R6:${LOCALBASE}:g" \
< ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in
pre-install:
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 99931cc..f8b0189 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spiralsynth
PORTVERSION= 0.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/
DISTNAME= SpiralSynth-${PORTVERSION}
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
PLIST= ${WRKDIR}/pkg-plist
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -47,7 +46,7 @@ post-patch:
s|CXXFLAGS=|CXXFLAGS+=|g ; \
s|LINK = g++|LINK = ${CXX}|g ; \
s|-lm|${PTHREAD_LIBS} -lm|g ; \
- s|/usr/X11R6|${X11BASE}|g ; \
+ s|/usr/X11R6|${LOCALBASE}|g ; \
s|iostream.h|iostream|g ;\
s|<strstream>|<sstream>|g ;\
s|machine/soundcard|sys/soundcard|g' \
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index b81c6af..33f34b8 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -55,7 +55,7 @@ post-patch:
s|MidiPlugin||' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include -I${X11BASE}/include|' \
+ @${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include|' \
${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in
@${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \
@@ -83,7 +83,7 @@ post-patch:
s|^CC[[:space:]]*=.+$$|CC=${CC}|; \
s|^CXX[[:space:]]*=.+$$|CXX=${CXX}|; \
s|g\+\+|${CXX}|; \
- s,@FLTK_(C|CXX)FLAGS@,-I${X11BASE}/include -I${LOCALBASE}/include,; \
+ s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \
s|-lpthread|${PTHREAD_LIBS}|g'
.include <bsd.port.post.mk>
diff --git a/audio/swami/Makefile b/audio/swami/Makefile
index 7fcc2db..e3efd58 100644
--- a/audio/swami/Makefile
+++ b/audio/swami/Makefile
@@ -7,10 +7,9 @@
PORTNAME= swami
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An advanced instrument editor
@@ -22,7 +21,6 @@ LIB_DEPENDS= fluidsynth.2:${PORTSDIR}/audio/fluidsynth \
png.5:${PORTSDIR}/graphics/png
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk12
WANT_GNOME= yes
USE_LDCONFIG= yes
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index 85a8e96..4392104 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library for manipulating ID3 tags and Ogg comments
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index ddb97db..f83ac94 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -7,10 +7,9 @@
PORTNAME= tagtool
PORTVERSION= 0.12.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A GNOME MP3/Ogg file tagger
@@ -20,7 +19,6 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack libglade2
-USE_XLIB= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/teamspeak_client/Makefile b/audio/teamspeak_client/Makefile
index ab5fe98..dc2c5b6 100644
--- a/audio/teamspeak_client/Makefile
+++ b/audio/teamspeak_client/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NO_BUILD= yes
TSIMG= ${WRKSRC}/setup.data/image
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index f985ef1..3bf391c 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= terminatorx
PORTVERSION= 3.82
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://terminatorx.org/dist/
DISTNAME= terminatorX-${PORTVERSION}
@@ -22,8 +22,8 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
jack.0:${PORTSDIR}/audio/jack
USE_BZIP2= yes
-USE_XLIB= yes
INSTALLS_OMF= yes
+USE_XORG= x11 xext xi xxf86dga
USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/ufmcontrol-i18n/Makefile b/audio/ufmcontrol-i18n/Makefile
index 375f085..93071c3 100644
--- a/audio/ufmcontrol-i18n/Makefile
+++ b/audio/ufmcontrol-i18n/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:C/-i18n$//1}
MAINTAINER= nivit@FreeBSD.org
COMMENT= USB radio control utility
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAKE_ENV= NOPROFILE=yes
MAN1= ufmcontrol.1
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index ebffe32..d1026e0 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vat
PORTVERSION= 4.0b2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mbone tk
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
@@ -25,7 +25,7 @@ BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
gsm.1:${GSM_DIR}
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
diff --git a/audio/wavplay/files/patch-aa b/audio/wavplay/files/patch-aa
index 5132232..15edb22 100644
--- a/audio/wavplay/files/patch-aa
+++ b/audio/wavplay/files/patch-aa
@@ -75,7 +75,7 @@
# installed).
#
-#CUSTINCL= -I/usr/X11R6/include/X11 -I/usr/local/lesstif/include/Xm
-+#CUSTINCL= -I${X11BASE}/include/X11 -I${X11BASE}/include/Xm -I/${X11BASE}/include
++#CUSTINCL= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include/Xm -I/${LOCALBASE}/include
#----------------------------------------------------------------------
# Normally, you shouldn't need to change anything beyond this point:
diff --git a/audio/wmcdplay/Makefile b/audio/wmcdplay/Makefile
index aea500a..77b913e 100644
--- a/audio/wmcdplay/Makefile
+++ b/audio/wmcdplay/Makefile
@@ -20,6 +20,6 @@ PLIST_FILES= bin/wmcdplay
WRKSRC= ${WRKDIR}/wmcdplay
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
.include <bsd.port.mk>
diff --git a/audio/wmfmixer/Makefile b/audio/wmfmixer/Makefile
index 70ae7f3..3a02d7b 100644
--- a/audio/wmfmixer/Makefile
+++ b/audio/wmfmixer/Makefile
@@ -17,8 +17,7 @@ COMMENT= An audio mixer for the WindowMaker dock
PLIST_FILES= bin/wmfmixer
USE_GMAKE= yes
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= xpm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/audio/wmfmixer/files/patch-Makefile b/audio/wmfmixer/files/patch-Makefile
index f02dd59..1e0641a 100644
--- a/audio/wmfmixer/files/patch-Makefile
+++ b/audio/wmfmixer/files/patch-Makefile
@@ -4,8 +4,8 @@
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS += -c
-+INCDIR = -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
LIBS = -lXpm -lXext -lX11
-CFLAGS = -O2
-OBJS = wmfmixer.o wmgeneral.o
diff --git a/audio/wmix/Makefile b/audio/wmix/Makefile
index 17daabb..5f73c50 100644
--- a/audio/wmix/Makefile
+++ b/audio/wmix/Makefile
@@ -17,8 +17,8 @@ COMMENT= An audio mixer for the WindowMaker dock with TV-like OSD
PLIST_FILES= bin/wmix
ALL_TARGET= ${PORTNAME}
USE_XORG= xpm
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
PORTDOCS= AUTHORS BUGS INSTALL NEWS README
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 2de918f..65f080e 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -19,7 +19,7 @@ COMMENT= An audio mixer for the WindowMaker dock
PLIST_FILES= bin/wmmixer
WRKSRC= ${WRKDIR}/wmmixer
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
NO_INSTALL_MANPAGES= yes
.include <bsd.port.mk>
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 00283aa..41e1800 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -6,7 +6,7 @@
PORTNAME= wmmp3
PORTVERSION= 0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.dotfiles.com/software/wmmp3/
@@ -16,8 +16,7 @@ COMMENT= A front-end for mpg123 in a Window Maker dockapp
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
post-install:
@${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples/wmmp3"
diff --git a/audio/wmrecord/Makefile b/audio/wmrecord/Makefile
index 9bbd060..aa381e8 100644
--- a/audio/wmrecord/Makefile
+++ b/audio/wmrecord/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmrecord
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio windowmaker
MASTER_SITES= http://linkinnovations.linux.tucows.com/files/x11/dock/ \
http://www.bsd-geek.de/FreeBSD/distfiles/
@@ -15,10 +15,9 @@ MASTER_SITES= http://linkinnovations.linux.tucows.com/files/x11/dock/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= General purpose audio recording utility for the WindowMaker dock
-USE_XPM= yes
-USE_X_PREFIX= yes
-MAKE_ARGS= LIBS="-L${X11BASE}/lib -lXpm -lX11 -lXext" \
- CFLAGS="${CFLAGS} -I${X11BASE}/include" LIBDIR=""
+USE_XORG= xpm x11 xext
+MAKE_ARGS= LIBS="-L${LOCALBASE}/lib -lXpm -lX11 -lXext" \
+ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBDIR=""
MAN1= wmrecord.1
PLIST_FILES= bin/wmrecord
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index 0a148d8..1fdd83a 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= lx@redundancy.redundancy.org
COMMENT= An audio mixer for the WindowMaker dock
PLIST_FILES= bin/wmsmixer
-USE_XPM= YES
+USE_XORG= xpm
USE_IMAKE= YES
MAKE_ARGS= CC="${CXX}" CFLAGS="${CXXFLAGS}"
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index a70d757..7288729 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -16,8 +16,7 @@ COMMENT= A remote control dockapp for xmms
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 6412d8f..5656e10 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -27,6 +27,6 @@ PLIST_FILES= bin/workman lib/help/workman.info
.include <bsd.port.pre.mk>
post-install:
- ${GZIP_CMD} ${X11BASE}/man/man5/workmandb.5
+ ${GZIP_CMD} ${PREFIX}/man/man5/workmandb.5
.include <bsd.port.post.mk>
diff --git a/audio/wsoundprefs/files/patch-ab b/audio/wsoundprefs/files/patch-ab
index 1f12b64..1b6f7ca 100644
--- a/audio/wsoundprefs/files/patch-ab
+++ b/audio/wsoundprefs/files/patch-ab
@@ -21,7 +21,7 @@
-STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
+WINGSLIBS = -lWINGs -L/$(LOCALBASE)/lib -lPropList
+
-+STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include -I${X11BASE}/include/WINGs
++STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs
DEPLIBS = $(DEPXLIB)
-LOCAL_LIBRARIES = $(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
diff --git a/audio/wsoundprefs/pkg-descr b/audio/wsoundprefs/pkg-descr
index dac5058..c9f6345 100644
--- a/audio/wsoundprefs/pkg-descr
+++ b/audio/wsoundprefs/pkg-descr
@@ -1,13 +1,13 @@
-This utility allows you to configure wsoundserver for Window Maker. It provides
-a browse list for selecting the SoundSets and the Sounds that are installed.
-It allows you to save your own SoundSets and load them or other preconfigured
+This utility allows you to configure wsoundserver for Window Maker. It provides
+a browse list for selecting the SoundSets and the Sounds that are installed.
+It allows you to save your own SoundSets and load them or other preconfigured
SoundSets.
-It is similar in form and function to WPrefs that is installed with
-Window Maker.
+It is similar in form and function to WPrefs that is installed with
+Window Maker.
To run it, enter the following command:
-${X11BASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs
+${LOCALBASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs
The following icon is recommended for the dock or clip of Window Maker:
-${X11BASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff
+${LOCALBASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 041699e..508921f 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wsoundserver
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio windowmaker
MASTER_SITES= ${MASTER_SITE_NETBSD}
DISTNAME= WSoundServer-${PORTVERSION}
@@ -22,11 +22,10 @@ LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
WANT_GNOME= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/WINGs"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/WINGs"
MAN1= get-wsound-flags.1x getsoundset.1x setsoundset.1x \
wsoundplay.1x wsoundserver.1x
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 2e2d4a1..2c1e18d 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES= bin/xanalyser \
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
-e 's|-lXm |${MOTIFLIB} |g' ${WRKSRC}/src/Makefile.in
.include <bsd.port.mk>
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 02e936c..11ca463 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmixer
PORTVERSION= 0.9.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://mpx.freeshell.net/
@@ -32,7 +32,7 @@ PROGRAMS= xmixer xgmixer
MLINKS+= xmixer.1 xgmixer.1
PLIST_FILES+= bin/xgmixer
.else
-USE_XLIB= yes
+USE_XORG= x11 xt ice xaw
PROGRAMS= xmixer
.endif
diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index e71969b..9daef35 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -17,7 +17,7 @@ COMMENT= A52 (aka AC3) decoder plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
a52.0:${PORTSDIR}/audio/liba52
-RUN_DEPENDS= ${X11BASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms-osssurround
+RUN_DEPENDS= ${LOCALBASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms-osssurround
USE_BZIP2= yes
USE_GNOME= gtk12
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 37ad947..c6e8bbe 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_GNOME= gtk12
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_FILES= lib/xmms/Output/libarts.a \
lib/xmms/Output/libarts.la \
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index 53c5c85..2b2e44d 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.92
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://ftp.ussg.iu.edu/FreeBSD/distfiles/ \
- http://T32.TecNik93.com/FreeBSD/others_ports/xmms-crystality/sources/ \
+ http://T32.TecNik93.com/FreeBSD/others_ports/xmms-crystality/sources/
PKGNAMEPREFIX= xmms-
DISTNAME= ${PORTNAME}-plugin-${PORTVERSION}
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index f3b2b44..6567f82 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xmms-flac
PORTVERSION= 1.2.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= flac
+MASTER_SITES= SF/flac
DISTNAME= flac-${PORTVERSION}
MAINTAINER= naddy@FreeBSD.org
@@ -22,7 +21,7 @@ USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
- --with-xmms-prefix="${X11BASE}"
+ --with-xmms-prefix="${LOCALBASE}"
MAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static"
MAKE_ENV= MAKEOBJDIR=/nonexistent # ignore ${WRKSRC}/obj
MAKEFILE= ${FILESDIR}/Makefile
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 8d10863..4ff1676 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -7,10 +7,9 @@
PORTNAME= imms
PORTVERSION= 1.2a
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
MAINTAINER= ports@FreeBSD.org
@@ -25,7 +24,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
tag.5:${PORTSDIR}/audio/taglib
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
USE_AUTOTOOLS= autoheader:261 autoconf:261
diff --git a/audio/xmms-infopipe/Makefile b/audio/xmms-infopipe/Makefile
index d6654d8..1f0af91 100644
--- a/audio/xmms-infopipe/Makefile
+++ b/audio/xmms-infopipe/Makefile
@@ -26,7 +26,7 @@ USE_LDCONFIG= yes
LIBDIR?= ${PREFIX}/lib/xmms/General
SRCLIBDIR?= src/.libs
-LDCONFIG_DIRS= %%X11BASE%%/lib/xmms/General
+LDCONFIG_DIRS= %%LOCALBASE%%/lib/xmms/General
PLIST_FILES= lib/xmms/General/libinfopipe.so
post-patch:
diff --git a/audio/xmms-jackasyn/Makefile b/audio/xmms-jackasyn/Makefile
index b732791..44ed24d 100644
--- a/audio/xmms-jackasyn/Makefile
+++ b/audio/xmms-jackasyn/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gtk12 gnometarget
USE_GMAKE= yes
GNU_CONFIGURE= yes
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
-CXXFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CXXFLAGS+= -I${LOCALBASE}/include
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CXXFLAGS}"
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index a2ef6a9..420b234 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -19,12 +19,12 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_FILES= lib/xmms/General/libmailnotify.so \
lib/xmms/General/alert.wav
post-patch:
- ${REINPLACE_CMD} -e "s,/usr/lib,${X11BASE}/lib," ${WRKSRC}/mailnotify.c
+ ${REINPLACE_CMD} -e "s,/usr/lib,${LOCALBASE}/lib," ${WRKSRC}/mailnotify.c
.include <bsd.port.mk>
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 2a58997..cfaefd2 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -7,7 +7,7 @@
PORTNAME= modplug
PORTVERSION= 2.0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= audio
MASTER_SITES= SFE
MASTER_SITE_SUBDIR= ${PORTNAME}-${PKGNAMEPREFIX:S/-//}
@@ -20,7 +20,6 @@ COMMENT= A modplug-based plugin for XMMS
LIB_DEPENDS?= xmms.4:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
-USE_X_PREFIX= yes
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
PLUGDIR?= lib/xmms/Input
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index e33632f..fbd3bdf 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -19,7 +19,7 @@ COMMENT= Motif based FM tuner (for use with bt848 driver)
#RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_MOTIF= yes
ONLY_FOR_ARCHS= i386 ia64
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 2aa433f..ec5ce2c 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xsidplay
PORTVERSION= 1.6.5.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= audio emulators
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
@@ -16,13 +16,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical front end for libsidplay
-USE_X_PREFIX= yes
USE_QT_VER= 3
USE_GNOME= gnometarget
WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-qt3 --with-qt-binaries=${X11BASE}/bin
+CONFIGURE_ARGS= --with-qt3 --with-qt-binaries=${LOCALBASE}/bin
MAN1= xsidplay.1
PLIST_FILES= bin/xsidplay
diff --git a/audio/xspeakfree/Makefile b/audio/xspeakfree/Makefile
index d52027c..963575b 100644
--- a/audio/xspeakfree/Makefile
+++ b/audio/xspeakfree/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xspeakfree
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mbone net audio
MASTER_SITES= http://www.liquidx.org/distfiles/
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
${LOCALBASE}/bin/sfmike:${PORTSDIR}/mbone/speak_freely \
NO_BUILD= yes
-USE_X_PREFIX= yes
PORTDOCS= BUGS HISTORY INSTALL LICENSE README TODO
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index bbf847e..a8db77a 100644
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
PLIST_FILES= bin/xtuner
USE_IMAKE= YES
-USE_XPM= YES
+USE_XORG= xpm
.include <bsd.port.pre.mk>
diff --git a/audio/xvmixer/Makefile b/audio/xvmixer/Makefile
index 40e83c69..66f34f7 100644
--- a/audio/xvmixer/Makefile
+++ b/audio/xvmixer/Makefile
@@ -16,8 +16,8 @@ COMMENT= Open Look-based audio mixer
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include -DUSE_XBM_ICON" \
- LDFLAGS="-L${X11BASE}/lib" LIBRARIES="-lxview -lolgx -lX11"
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DUSE_XBM_ICON" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBRARIES="-lxview -lolgx -lX11"
PLIST_FILES= bin/xvmixer
do-install:
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index f174477..f18f908 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -18,7 +18,7 @@ COMMENT= Audio player/recorder/editor for the X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}2-981109
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
DOC_FILES= README README-XWAVE2 README.v06 INSTALL
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index bd74798..470b3da 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -7,10 +7,9 @@
PORTNAME= zinf
PORTVERSION= 2.2.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK-based MP3 player
@@ -19,7 +18,6 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
gdbm.3:${PORTSDIR}/databases/gdbm
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget gtk20 lthack
WANT_GNOME= yes
USE_PERL5= yes
OpenPOWER on IntegriCloud