- Cleanup objformat-removal fallout

- Use USE_LDCONFIG

Approved by:	portmgr (pav; implicit)

7 files changed, 27 insertions, 6 deletions

diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile
index 01db4336d445..8db322dc6544 100644
--- a/graphics/xmms-fishmatic/Makefile
+++ b/graphics/xmms-fishmatic/Makefile
@@ -24,6 +24,7 @@ USE_X_PREFIX=   yes
 USE_GNOME=      gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
+USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	LIBS="-lGL -lXext ${LIBS}"
 CFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib
@@ -34,5 +35,6 @@ post-patch:
 		s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
 
 .include <bsd.port.mk>
diff --git a/graphics/xmms-gdancer/Makefile b/graphics/xmms-gdancer/Makefile
index c90611b01e33..1f25e645dbce 100644
--- a/graphics/xmms-gdancer/Makefile
+++ b/graphics/xmms-gdancer/Makefile
@@ -21,12 +21,15 @@ PLIST_FILES=	lib/xmms/Visualization/gdancer.so
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 gdkpixbuf
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-pixbuf
 
+post-patch:
+	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
+
 post-install:
 	-${RM} ${PREFIX}/lib/xmms/Visualization/gdancer.la
 	@${CAT} ${PKGMESSAGE}
diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile
index 4b241d8ebd2c..9fbcd2c2657b 100644
--- a/graphics/xmms-goom/Makefile
+++ b/graphics/xmms-goom/Makefile
@@ -27,13 +27,14 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+BROKEN=		Does not compile on !i386
 .endif
 
 post-patch:
@@ -41,5 +42,6 @@ post-patch:
 		s|-lgtk|`${GTK_CONFIG} --libs`|g; \
 		s|-O9||' \
 		${BUILD_WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
 
 .include <bsd.port.post.mk>
diff --git a/graphics/xmms-infinity/Makefile b/graphics/xmms-infinity/Makefile
index 242e56522354..ddcd8ed97b24 100644
--- a/graphics/xmms-infinity/Makefile
+++ b/graphics/xmms-infinity/Makefile
@@ -25,5 +25,9 @@ USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
+USE_LDCONFIG=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
 
 .include <bsd.port.mk>
diff --git a/graphics/xmms-iris/Makefile b/graphics/xmms-iris/Makefile
index 5532ba615469..1ad7cbf5a908 100644
--- a/graphics/xmms-iris/Makefile
+++ b/graphics/xmms-iris/Makefile
@@ -19,15 +19,18 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=       --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	lib/xmms/Visualization/libiris.so
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
+USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} \
+		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
+		-e '/objformat=/s|=.*|=elf|' \
+			${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/xmms-jess/Makefile b/graphics/xmms-jess/Makefile
index fa17d5be6433..166a02947857 100644
--- a/graphics/xmms-jess/Makefile
+++ b/graphics/xmms-jess/Makefile
@@ -23,5 +23,9 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	lib/xmms/Visualization/libjess.so lib/xmms/Visualization/libjess.la
 USE_GNOME=	glib12
 USE_X_PREFIX=	yes
+USE_LDCONFIG=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index fe96c6f38ea4..e1f69c9e36aa 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -25,9 +25,12 @@ CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include/libxml2/libxml"
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
+
 .include <bsd.port.mk>