From owner-freebsd-ports Sun May 20 17:20:11 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B9E8D37B422 for ; Sun, 20 May 2001 17:20:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f4L0K3Q98641; Sun, 20 May 2001 17:20:03 -0700 (PDT) (envelope-from gnats) Date: Sun, 20 May 2001 17:20:03 -0700 (PDT) Message-Id: <200105210020.f4L0K3Q98641@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Will Andrews Subject: Re: ports/27479: Update port: misc/xosd (maintainer) Reply-To: Will Andrews Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/27479; it has been noted by GNATS. From: Will Andrews To: FreeBSD GNATS DB Cc: Subject: Re: ports/27479: Update port: misc/xosd (maintainer) Date: Sun, 20 May 2001 19:07:11 -0500 patch sent in, forwarding to gnats audit-trail ----- Forwarded message from Hye-Shik Chang ----- Date: Sun, 20 May 2001 17:10:03 -0700 (PDT) Reply-To: Hye-Shik Chang From: Hye-Shik Chang To: freebsd-ports@FreeBSD.ORG Subject: Re: ports/27479: Update port: misc/xosd (maintainer) Sender: owner-freebsd-ports@FreeBSD.ORG The following reply was made to PR ports/27479; it has been noted by GNATS. From: Hye-Shik Chang To: freebsd-gnats-submit@FreeBSD.org, petef@databits.net Cc: Subject: Re: ports/27479: Update port: misc/xosd (maintainer) Date: Mon, 21 May 2001 09:01:21 +0900 (KST) >++ 20/05/01 16:38 -0700 - perky@python.or.kr: >| >| -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt >| +LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ >| + glib12.3:${PORTSDIR}/devel/glib12 \ >| + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 > >I think this is better accomplished with USE_GTK= Yes (a hook from >bsd.gnome.mk). > >-pete > >-- >Pete Fritchman >Databits Network Services, Inc. >finger petef@databits.net for PGP key > new patch. thank you pete diff -ruN xosd.orig/Makefile xosd/Makefile --- xosd.orig/Makefile Sun May 20 12:01:54 2001 +++ xosd/Makefile Mon May 21 08:52:50 2001 @@ -7,6 +7,7 @@ PORTNAME= xosd PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www.ignavus.net/ \ http://www3.kr.freebsd.org/~perky/distfiles/ @@ -20,8 +21,12 @@ USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes +USE_GLIB= yes INSTALLS_SHLIB= yes -MAKE_ENV= CFLAGS='${CFLAGS}' PREFIX='${PREFIX}' +MAKE_ENV= CFLAGS='${CFLAGS}' PREFIX='${PREFIX}' \ + X11BASE='${X11BASE}' LOCALBASE='${LOCALBASE}' \ + GTK_CONFIG='${GTK_CONFIG}' MAN1= osd_cat.1 MAN3= xosd.3 diff -ruN xosd.orig/files/patch-aa xosd/files/patch-aa --- xosd.orig/files/patch-aa Sun May 20 12:01:55 2001 +++ xosd/files/patch-aa Mon May 21 08:54:57 2001 @@ -1,11 +1,12 @@ -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 @@ ++++ Makefile Mon May 21 08:54:15 2001 +@@ -5,20 +5,20 @@ LIBRARY_VERSION=0 VERSION=0.7.0 -PREFIX=/usr/local ++LOCALBASE?=/usr/local ++X11BASE?=/usr/X11R6 EXEC_PREFIX=$(PREFIX) BINDIR=$(EXEC_PREFIX)/bin LIBDIR=$(EXEC_PREFIX)/lib @@ -19,12 +20,29 @@ -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 ++CFLAGS+=-I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include -I/usr/local/include -I$(X11BASE)/include/gtk12 -I$(LOCALBASE)/include/glib12 +LDFLAGS=-lc_r -L. -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -pthread -lXt -lgnugetopt XOSDLIBS=-lxosd -@@ -66,9 +64,11 @@ +@@ -44,10 +44,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) `$(X11BASE)/bin/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 +70,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 @@ -37,11 +55,12 @@ + 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/ -diff -ruN xosd.c.orig xosd.c + $(INSTALL_DATA) xosd.3 $(MANDIR)/man3/ --- xosd.c.orig Fri Mar 23 08:55:45 2001 -+++ xosd.c Wed May 2 04:34:44 2001 ++++ xosd.c Mon May 21 08:41:45 2001 @@ -270,7 +270,7 @@ if (!XCheckWindowEvent (osd->display, osd->window, ExposureMask, &report)) { diff -ruN xosd.orig/pkg-plist xosd/pkg-plist --- xosd.orig/pkg-plist Sun May 20 12:01:54 2001 +++ xosd/pkg-plist Mon May 21 08:07:17 2001 @@ -1,4 +1,5 @@ bin/osd_cat +include/xosd.h lib/libxosd.so lib/libxosd.so.0 %%WITH_XMMS%%lib/xmms/General/libxmms_osd.so -------------------------------- Hye-Shik Chang, a.k.a. "Perky" Mechatronics, Yonsei University, Korea Public Key: http://openlook.org/pgp.txt PGP Fingerprint : 115C CF2F D90D 8AFE F45B 0356 21DA 398B 6474 11EA ------------------------------------------------- DreamWiz Free Mail @ http://www.dreamwiz.com/ DreamSearch Click the world!!! http://search.dreamwiz.com/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message ----- End forwarded message ----- -- wca To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message