Date: Sun, 20 May 2001 16:38:24 -0700 (PDT) From: perky@python.or.kr To: freebsd-gnats-submit@FreeBSD.org Subject: ports/27479: Update port: misc/xosd (maintainer) Message-ID: <200105202338.f4KNcOJ94108@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 27479 >Category: ports >Synopsis: Update port: misc/xosd (maintainer) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 20 16:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Chang, Hye-Shik >Release: FreeBSD 4.3 >Organization: Yonsei University >Environment: FreeBSD 4.3 stable >Description: . dependency was not complete. added gtk12 and glib12 . couldnot build WITHOUT_XMMS=yes without xmms library . gtk12, glib12, xmms path corrected . installs header file . xmms-config & gtk12-config path corrected. thank you, Will :) >How-To-Repeat: >Fix: diff -ruN xosd.orig/Makefile xosd/Makefile --- xosd.orig/Makefile Sun May 20 12:01:54 2001 +++ xosd/Makefile Mon May 21 08:31:21 2001 @@ -7,13 +7,16 @@ PORTNAME= xosd PORTVERSION= 0.7.0 +PORTREVISION= 1 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 +LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ + glib12.3:${PORTSDIR}/devel/glib12 \ + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 .if defined(WITH_XMMS) LIB_DEPENDS+= xmms.1:${PORTSDIR}/audio/xmms .endif @@ -21,7 +24,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -MAKE_ENV= CFLAGS='${CFLAGS}' PREFIX='${PREFIX}' +MAKE_ENV= CFLAGS='${CFLAGS}' PREFIX='${PREFIX}' \ + X11BASE='${X11BASE}' LOCALBASE='${LOCALBASE}' 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:24:53 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:24:41 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) `$(X11BASE)/bin/gtk12-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:21:44 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105202338.f4KNcOJ94108>