7 files changed, 113 insertions, 0 deletions

diff --git a/misc/Makefile b/misc/Makefile
index a25f61a7b75e..954c70d3fb70 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -178,6 +178,7 @@
     SUBDIR += xenmenu
     SUBDIR += xgas
     SUBDIR += xless
+    SUBDIR += xosd
     SUBDIR += xpns
     SUBDIR += xquote
     SUBDIR += xtail
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
new file mode 100644
index 000000000000..b9f0e645a2bb
--- /dev/null
+++ b/misc/xosd/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	xosd
+# Date created:			2 May 2001
+# Whom:				Hye-Shik Chang <perky@python.or.kr>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xosd
+PORTVERSION=	0.7.0
+CATEGORIES=	misc
+MASTER_SITES=	http://www.ignavus.net/ \
+		http://www3.kr.freebsd.org/~perky/distfiles/
+
+MAINTAINER=	perky@python.or.kr
+
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+.if defined(WITH_XMMS)
+LIB_DEPENDS+=	xmms.1:${PORTSDIR}/audio/xmms
+.endif
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+INSTALLS_SHLIB=	yes
+MAKE_ENV=	CFLAGS='${CFLAGS}' PREFIX='${PREFIX}'
+
+MAN1=		osd_cat.1
+MAN3=		xosd.3
+
+.if defined(WITH_XMMS)
+MAKE_ENV+=	XMMS_PLUGINDIR=${X11BASE}/lib/xmms
+PLIST_SUB+=	WITH_XMMS=""
+.else
+PLIST_SUB+=	WITH_XMMS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/misc/xosd/distinfo b/misc/xosd/distinfo
new file mode 100644
index 000000000000..665f3004597f
--- /dev/null
+++ b/misc/xosd/distinfo
@@ -0,0 +1 @@
+MD5 (xosd-0.7.0.tar.gz) = ff80b31ea3ee52e33855b9723642b8a6
diff --git a/misc/xosd/files/patch-aa b/misc/xosd/files/patch-aa
new file mode 100644
index 000000000000..36ad971be26e
--- /dev/null
+++ b/misc/xosd/files/patch-aa
@@ -0,0 +1,62 @@
+diff -ruN Makefile.orig Makefile
+--- Makefile.orig	Fri Mar 23 09:11:14 2001
++++ Makefile	Wed May  2 05:30:30 2001
+@@ -5,20 +5,18 @@
+ LIBRARY_VERSION=0
+ VERSION=0.7.0
+ 
+-PREFIX=/usr/local
+ EXEC_PREFIX=$(PREFIX)
+ BINDIR=$(EXEC_PREFIX)/bin
+ LIBDIR=$(EXEC_PREFIX)/lib
+ MANDIR=$(PREFIX)/man
+ INCLUDEDIR=$(PREFIX)/include
+-XMMS_PLUGINDIR=$(HOME)/.xmms
+ 
+ CC=gcc
+ INSTALL=/usr/bin/install -c
+ INSTALL_DATA=$(INSTALL) -m 644
+ 
+-CFLAGS=-O2 -Wall -pipe -I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include
+-LDFLAGS=-L. -L/usr/X11R6/lib -lX11 -lXext -lpthread -lXt
++CFLAGS+=-I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include -I/usr/local/include
++LDFLAGS=-lc_r -L. -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -pthread -lXt -lgnugetopt
+ 
+ XOSDLIBS=-lxosd
+ 
+@@ -66,9 +64,11 @@
+ 	$(INSTALL) libxosd.so $(LIBDIR)/libxosd.so.$(LIBRARY_VERSION)
+ 	rm -f $(PREFIX)/lib/libxosd.so
+ 	ln -s $(PREFIX)/lib/libxosd.so.$(LIBRARY_VERSION) $(PREFIX)/lib/libxosd.so
+-	mkdir -p $(XMMS_PLUGINDIR)/Plugins/General
+-	rm -f $(XMMS_PLUGINDIR)/Plugins/General/libxmms_osd.so
+-	cp -a libxmms_osd.so $(XMMS_PLUGINDIR)/Plugins/General
++	if [ "$(XMMS_PLUGINDIR)" ]; then \
++		mkdir -p $(XMMS_PLUGINDIR)/General; \
++		rm -f $(XMMS_PLUGINDIR)/General/libxmms_osd.so; \
++		cp -pf libxmms_osd.so $(XMMS_PLUGINDIR)/General; \
++	fi
+ 	$(INSTALL) osd_cat $(BINDIR)
+ 	mkdir -p $(MANDIR)/man1 $(MANDIR)/man3
+ 	$(INSTALL_DATA) osd_cat.1 $(MANDIR)/man1/
+diff -ruN xosd.c.orig xosd.c
+--- xosd.c.orig	Fri Mar 23 08:55:45 2001
++++ xosd.c	Wed May  2 04:34:44 2001
+@@ -270,7 +270,7 @@
+       if (!XCheckWindowEvent (osd->display, osd->window, ExposureMask, &report))
+ 	 {
+ 	 MUTEX_RELEASE ();
+-	 usleep (500);
++	 usleep (100000);
+ 	 continue;
+ 	 }
+       MUTEX_RELEASE ();
+@@ -304,7 +304,7 @@
+    
+    while (!osd->done)
+       {
+-      usleep (1000);
++      usleep (200000);
+       MUTEX_GET ();
+       if (osd->timeout != -1 && 
+ 	  osd->mapped && 
diff --git a/misc/xosd/pkg-comment b/misc/xosd/pkg-comment
new file mode 100644
index 000000000000..c2aabef5934b
--- /dev/null
+++ b/misc/xosd/pkg-comment
@@ -0,0 +1 @@
+X On-Screen-Display Library and XMMS plug-in
diff --git a/misc/xosd/pkg-descr b/misc/xosd/pkg-descr
new file mode 100644
index 000000000000..5987a6cdfef4
--- /dev/null
+++ b/misc/xosd/pkg-descr
@@ -0,0 +1,8 @@
+XOSD displays text on your screen, sounds simple right?
+The difference is it is unmanaged and shaped, so it appears
+transparent. This gives the effect of an On Screen Display,
+like your TV/VCR etc.. The package also includes an xmms
+plugin, which automatically displays various interesting
+things as they change (song name, volume etc...) 
+
+WWW: http://www.ignavus.net/software.html
diff --git a/misc/xosd/pkg-plist b/misc/xosd/pkg-plist
new file mode 100644
index 000000000000..33be5c007874
--- /dev/null
+++ b/misc/xosd/pkg-plist
@@ -0,0 +1,4 @@
+bin/osd_cat
+lib/libxosd.so
+lib/libxosd.so.0
+%%WITH_XMMS%%lib/xmms/General/libxmms_osd.so