First batch of USE_GNOME=ltverhack -> USES=libtool.

Use INSTALL_TARGET=install-strip if possible. Misc Makefile cleanups.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19001 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 6 insertions, 98 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 88ecbeeb8..13efb2fe9 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -26,12 +26,11 @@ LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
 
 USE_XZ=		yes
-USE_GNOME=	glib20 intltool ltverhack gnomehier
+USE_GNOME=	glib20 intltool gnomehier
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl libtool
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -41,6 +40,7 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		ac_cv_header_linux_input_h=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-database=simple \
@@ -122,8 +122,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
 		${STAGEDIR}${PREFIX}/etc/pulse/${ii}-dist
 .endfor
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pulseaudio/libpulse*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpulse*.so*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pulse-${PORTVERSION}/modules/*.so
 
 .include <bsd.port.post.mk>
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 5e44faa9c..8e6a50f72 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -61,197 +61,108 @@ include/pulse/volume.h
 include/pulse/xmalloc.h
 lib/cmake/PulseAudio/PulseAudioConfig.cmake
 lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
-lib/libpulse-mainloop-glib.a
 lib/libpulse-mainloop-glib.la
 lib/libpulse-mainloop-glib.so
 lib/libpulse-mainloop-glib.so.0
-lib/libpulse-simple.a
+lib/libpulse-mainloop-glib.so.0.0.4
 lib/libpulse-simple.la
 lib/libpulse-simple.so
 lib/libpulse-simple.so.0
-lib/libpulse.a
+lib/libpulse-simple.so.0.0.4
 lib/libpulse.la
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulsecore-%%PULSE_VERSION%%.a
+lib/libpulse.so.0.16.2
 lib/libpulsecore-%%PULSE_VERSION%%.la
 lib/libpulsecore-%%PULSE_VERSION%%.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.a
 %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
-lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
-lib/pulse-%%PULSE_VERSION%%/modules/libraop.a
 lib/pulse-%%PULSE_VERSION%%/modules/libraop.so
-lib/pulse-%%PULSE_VERSION%%/modules/librtp.a
 lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-card.a
 %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-card.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.a
 %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.a
 %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-detect.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so
-%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.a
 %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jackdbus-detect.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jackdbus-detect.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-match.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-null-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-remap-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-remap-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-role-cork.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-role-cork.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-role-ducking.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-role-ducking.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
-lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.a
 lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.la
 lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.so
-lib/pulseaudio/libpulsedsp.a
 lib/pulseaudio/libpulsedsp.la
 lib/pulseaudio/libpulsedsp.so
 libdata/pkgconfig/libpulse-mainloop-glib.pc