From 12d3089394c8ff80c72b77b24badc58cfd819a16 Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Fri, 9 Aug 2002 05:24:27 +0000 Subject: Update to 1.0.0 --- misc/xosd/Makefile | 36 +++++++++++------------- misc/xosd/distinfo | 2 +- misc/xosd/files/patch-aa | 67 -------------------------------------------- misc/xosd/files/patch-xosd.c | 18 ++++++------ misc/xosd/pkg-plist | 11 ++++++-- 5 files changed, 35 insertions(+), 99 deletions(-) delete mode 100644 misc/xosd/files/patch-aa (limited to 'misc') diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index b5ae9ca25cd9..9875d4ed6ff3 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -6,38 +6,34 @@ # PORTNAME= xosd -PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0 CATEGORIES= misc -MASTER_SITES= http://www.ignavus.net/ \ - http://www3.kr.freebsd.org/~perky/distfiles/ +MASTER_SITES= http://www.ignavus.net/ MAINTAINER= perky@FreeBSD.org -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt -.if defined(WITH_XMMS) -LIB_DEPENDS+= xmms.3:${PORTSDIR}/audio/xmms -.endif +LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ + xmms.3:${PORTSDIR}/audio/xmms XMMS_CONFIG?= ${X11BASE}/bin/xmms-config USE_X_PREFIX= yes USE_GMAKE= yes USE_GTK= yes +USE_LIBTOOL= yes +USE_AUTOMAKE_VER= 15 +AUTOMAKE_ARGS= --add-missing +USE_AUTOCONF= yes INSTALLS_SHLIB= yes -MAKE_ENV= CFLAGS='${CFLAGS}' PREFIX='${PREFIX}' \ - X11BASE='${X11BASE}' LOCALBASE='${LOCALBASE}' \ - GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG="${GLIB_CONFIG}" \ - XMMS_CONFIG="${XMMS_CONFIG}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib -lgnugetopt' \ + CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' GTK_CONFIG='${GTK_CONFIG}' \ + GLIB_CONFIG='${GLIB_CONFIG}' XMMS_PLUGINDIR=${X11BASE}/lib/xmms MAN1= osd_cat.1 -MAN3= xosd.3 +MAN3= xosd_display.3 xosd_hide.3 xosd_init.3 xosd_is_onscreen.3 \ + xosd_set_offset.3 xosd_set_pos.3 xosd_set_shadow_offset.3 \ + xosd_show.3 xosd_uninit.3 xosd.3 xosd_get_number_lines.3 -.if defined(WITH_XMMS) -MAKE_ENV+= XMMS_PLUGINDIR=${X11BASE}/lib/xmms -PLIST_SUB+= WITH_XMMS="" -.else -PLIST_SUB+= WITH_XMMS="@comment " -.endif +pre-configure: + cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --force && ${ACLOCAL} .include diff --git a/misc/xosd/distinfo b/misc/xosd/distinfo index 665f3004597f..d5e0dfe93d4c 100644 --- a/misc/xosd/distinfo +++ b/misc/xosd/distinfo @@ -1 +1 @@ -MD5 (xosd-0.7.0.tar.gz) = ff80b31ea3ee52e33855b9723642b8a6 +MD5 (xosd-1.0.0.tar.gz) = 02cc1a532f2989752d5fbaa40ddcac5d diff --git a/misc/xosd/files/patch-aa b/misc/xosd/files/patch-aa deleted file mode 100644 index fde9830f79d9..000000000000 --- a/misc/xosd/files/patch-aa +++ /dev/null @@ -1,67 +0,0 @@ ---- Makefile Thu Mar 22 19:11:14 2001 -+++ Makefile.new Sun May 20 22:24:43 2001 -@@ -5,20 +5,25 @@ - LIBRARY_VERSION=0 - VERSION=0.7.0 - --PREFIX=/usr/local -+LOCALBASE?=/usr/local -+X11BASE?=/usr/X11R6 -+GTK_CONFIG?=$(X11BASE)/bin/gtk-config -+GLIB_CONFIG?=$(LOCALBASE)/bin/glib-config -+XMMS_CONFIG?=$(X11BASE)/bin/xmms-config -+PTHREAD_CFLAGS?=-D_THREAD_SAFE -+PTHREAD_LIBS?=-lpthread - EXEC_PREFIX=$(PREFIX) - BINDIR=$(EXEC_PREFIX)/bin - LIBDIR=$(EXEC_PREFIX)/lib - MANDIR=$(PREFIX)/man - INCLUDEDIR=$(PREFIX)/include --XMMS_PLUGINDIR=$(HOME)/.xmms - --CC=gcc -+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$(X11BASE)/include -I$(LOCALBASE)/include `$(GTK_CONFIG) --cflags` `$(GLIB_CONFIG) --cflags` $(PTHREAD_CFLAGS) -+LDFLAGS=$(PTHREAD_LIBS) -L. -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lXt -lgnugetopt - - XOSDLIBS=-lxosd - -@@ -44,10 +49,14 @@ - ranlib libxosd.a - - xmms_osd.o: xmms_osd.c -- $(CC) -c -o $@ xmms_osd.c `xmms-config --cflags` -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 $(CFLAGS) -+ if [ "$(XMMS_PLUGINDIR)" ]; then \ -+ $(CC) $(CFLAGS) `$(XMMS_CONFIG) --cflags` -c -o $@ xmms_osd.c; \ -+ fi - - libxmms_osd.so: xmms_osd.o -- $(CC) -shared -o $@ $+ $(LDFLAGS) `gtk-config --libs` $(XOSDLIBS) -+ if [ "$(XMMS_PLUGINDIR)" ]; then \ -+ $(CC) `$(GTK_CONFIG) --libs` -shared -o $@ $+ $(LDFLAGS) $(XOSDLIBS); \ -+ fi - - testprog: testprog.o libxosd.so - $(CC) -o $@ testprog.o $(LDFLAGS) $(XOSDLIBS) -@@ -66,10 +75,13 @@ - $(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) -+ $(INSTALL_DATA) xosd.h $(INCLUDEDIR)/ - mkdir -p $(MANDIR)/man1 $(MANDIR)/man3 - $(INSTALL_DATA) osd_cat.1 $(MANDIR)/man1/ - $(INSTALL_DATA) xosd.3 $(MANDIR)/man3/ diff --git a/misc/xosd/files/patch-xosd.c b/misc/xosd/files/patch-xosd.c index e2484171b2c1..f8d1c90dd3a1 100644 --- a/misc/xosd/files/patch-xosd.c +++ b/misc/xosd/files/patch-xosd.c @@ -1,16 +1,16 @@ ---- xosd.c Thu Mar 22 18:55:45 2001 -+++ xosd.c.new Sun May 20 23:13:52 2001 -@@ -270,7 +270,7 @@ +--- src/xosd.c.orig Fri Aug 9 13:49:59 2002 ++++ src/xosd.c Fri Aug 9 13:50:30 2002 +@@ -291,7 +291,7 @@ if (!XCheckWindowEvent (osd->display, osd->window, ExposureMask, &report)) { - MUTEX_RELEASE (); -- usleep (500); -+ usleep (100000); - continue; + MUTEX_RELEASE (); +- usleep (500); ++ usleep (100000); + continue; } MUTEX_RELEASE (); -@@ -304,7 +304,7 @@ - +@@ -326,7 +326,7 @@ + while (!osd->done) { - usleep (1000); diff --git a/misc/xosd/pkg-plist b/misc/xosd/pkg-plist index 13564e82afe4..8684a4759c71 100644 --- a/misc/xosd/pkg-plist +++ b/misc/xosd/pkg-plist @@ -1,5 +1,12 @@ bin/osd_cat +bin/xosd-config include/xosd.h +lib/libxosd.a +lib/libxosd.la lib/libxosd.so -lib/libxosd.so.0 -%%WITH_XMMS%%lib/xmms/General/libxmms_osd.so +lib/libxosd.so.1 +lib/xmms/General/libxmms_osd.a +lib/xmms/General/libxmms_osd.la +lib/xmms/General/libxmms_osd.so +lib/xmms/General/libxmms_osd.so.0 +share/aclocal/libxosd.m4 -- cgit v1.2.3