Date: Thu, 26 Jan 2006 08:27:42 GMT From: Roman Bogorodskiy <novel@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92347: [ patch ] misc/xosd: depend on gdk-pixbuf only when building xmms pluging Message-ID: <200601260827.k0Q8RgEf084064@freefall.freebsd.org> Resent-Message-ID: <200601260830.k0Q8U41J084128@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92347
>Category: ports
>Synopsis: [ patch ] misc/xosd: depend on gdk-pixbuf only when building xmms pluging
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 26 08:30:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
Depend on gdk-pixbuf only if building xmms plugin. Remove gtk12
dependency - it will be catched up by xmms. This change allows not
to keep this archaic gtk12 stuff if one is not using xmms.
>How-To-Repeat:
>Fix:
? work
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/xosd/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile 30 Nov 2004 15:19:58 -0000 1.30
+++ Makefile 26 Jan 2006 08:13:12 -0000
@@ -15,14 +15,11 @@
MAINTAINER= perky@FreeBSD.org
COMMENT= X On-Screen-Display Library and XMMS plug-in
-LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
USE_BZIP2= yes
USE_GETOPT_LONG=yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gtk12
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
@@ -44,7 +41,8 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_XMMS)
-LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms \
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
PLIST_SUB= WITH_XMMS=""
.else
CONFIGURE_ARGS= --disable-new-plugin
@@ -52,10 +50,10 @@
.endif
pre-patch:
- ${REINPLACE_CMD} -e 's,-lc_r,-lblahblah,g' ${WRKSRC}/ltmain.sh
- ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's,-lc_r,-lblahblah,g' ${WRKSRC}/ltmain.sh
+ @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure
.for f in src/libxosd/Makefile.in src/xmms_plugin/Makefile.in
- ${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I.. \2,g' ${WRKSRC}/$f
+ @${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I.. \2,g' ${WRKSRC}/$f
.endfor
.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601260827.k0Q8RgEf084064>