From 15afd931afa664c5d511a4ada8db12d2afeb8bdd Mon Sep 17 00:00:00 2001
From: perky <perky@FreeBSD.org>
Date: Fri, 4 Jun 2004 05:05:34 +0000
Subject: Update to 2.2.7

PR:		67352
Submitted by:	Roman Bogorodskiy <bogorodskiy@inbox.ru>
---
 misc/xosd/Makefile | 37 ++++++++++++++++++++-----------------
 misc/xosd/distinfo |  4 ++--
 2 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'misc/xosd')

diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 5839dce..d237ce2 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xosd
-PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTVERSION=	2.2.7
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ignavus.net/ \
 		${MASTER_SITE_LOCAL}
@@ -17,11 +16,9 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT=	X On-Screen-Display Library and XMMS plug-in
 
 LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-.if !defined(WITHOUT_XMMS)
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-.endif
 
 XMMS_CONFIG?=	${X11BASE}/bin/xmms-config
+USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -33,21 +30,27 @@ CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \
 		CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' \
 		GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \
 		XMMS_PLUGINDIR=${X11BASE}/lib/xmms
-.if defined(WITHOUT_XMMS)
+
+MAN1=		osd_cat.1 xosd-config.1
+MAN3=		xosd.3 xosd_create.3 xosd_destroy.3 xosd_display.3 \
+		xosd_get_number_lines.3 xosd_hide.3 xosd_is_onscreen.3 \
+		xosd_set_align.3 xosd_set_bar_length.3 \
+		xosd_set_horizontal_offset.3 xosd_set_pos.3 \
+		xosd_set_shadow_offset.3 xosd_set_vertical_offset.3 \
+		xosd_show.3 xosd_uninit.3
+
+OPTIONS=	XMMS "Install XMMS-OSD plugin" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XMMS)
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+PLIST_SUB=	WITH_XMMS=""
+.else
 CONFIGURE_ARGS=	--disable-new-plugin
 PLIST_SUB=	WITH_XMMS="@comment "
-PKGNAMESUFFIX=	-without-xmms
-.else
-PLIST_SUB=	WITH_XMMS=""
 .endif
 
-MAN1=		osd_cat.1 xosd-config.1
-MAN3=		xosd_destroy.3 xosd_is_onscreen.3 xosd_set_shadow_offset.3 \
-		xosd_display.3 xosd_set_align.3 xosd_set_vertical_offset.3 \
-		xosd.3 xosd_get_number_lines.3 xosd_set_horizontal_offset.3 \
-		xosd_show.3 xosd_create.3 xosd_hide.3 xosd_set_pos.3 \
-		xosd_uninit.3 xosd_set_bar_length.3
-
 pre-patch:
 	${REINPLACE_CMD} -e 's,-lc_r,-lblahblah,g' ${WRKSRC}/ltmain.sh
 	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure
@@ -55,4 +58,4 @@ pre-patch:
 	${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I.. \2,g' ${WRKSRC}/$f
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/xosd/distinfo b/misc/xosd/distinfo
index 71940a4..e5ede4c 100644
--- a/misc/xosd/distinfo
+++ b/misc/xosd/distinfo
@@ -1,2 +1,2 @@
-MD5 (xosd-2.2.5.tar.gz) = 96bae6f0800c1710d7d4edb3b37b01e5
-SIZE (xosd-2.2.5.tar.gz) = 388861
+MD5 (xosd-2.2.7.tar.bz2) = d523cf87f8010bed2f66301309f7bce9
+SIZE (xosd-2.2.7.tar.bz2) = 279916
-- 
cgit v1.1