From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 22 21:20:34 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1066416A44F for ; Sat, 22 Oct 2005 21:20:34 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 728B943D73 for ; Sat, 22 Oct 2005 21:20:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9MLKKS2013938 for ; Sat, 22 Oct 2005 21:20:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9MLKKjq013937; Sat, 22 Oct 2005 21:20:20 GMT (envelope-from gnats) Resent-Date: Sat, 22 Oct 2005 21:20:20 GMT Resent-Message-Id: <200510222120.j9MLKKjq013937@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Frank Ruell Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEEDF16A41F for ; Sat, 22 Oct 2005 21:14:35 +0000 (GMT) (envelope-from stoerte@dreamwarrior.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.FreeBSD.org (Postfix) with ESMTP id 200FB43D48 for ; Sat, 22 Oct 2005 21:14:34 +0000 (GMT) (envelope-from stoerte@dreamwarrior.net) Received: from reverse-82-141-48-78.dialin.kamp-dsl.de [82.141.48.78] (helo=sisyphos.foobar.ath.cx) by mrelayeu.kundenserver.de with ESMTP (Nemesis), id 0ML21M-1ETQhF0j0a-0004Dn; Sat, 22 Oct 2005 23:14:33 +0200 Received: from stoerte by sisyphos.foobar.ath.cx with local (Exim 4.52 (FreeBSD)) id 1ETQhE-000P4H-8j for FreeBSD-gnats-submit@freebsd.org; Sat, 22 Oct 2005 23:14:32 +0200 Message-Id: Date: Sat, 22 Oct 2005 23:14:32 +0200 From: Frank Ruell To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/87852: [maintainer-patch] x11-themes/gtk-industrial-theme - remove hard-coded paths X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Frank Ruell List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2005 21:20:34 -0000 >Number: 87852 >Category: ports >Synopsis: [maintainer-patch] x11-themes/gtk-industrial-theme - remove hard-coded paths >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Oct 22 21:20:20 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Frank Ruell >Release: FreeBSD 6.0-RC1 i386 >Organization: >Environment: System: FreeBSD sisyphos.foobar.ath.cx 6.0-RC1 FreeBSD 6.0-RC1 #0: Thu Oct 20 20:01:04 CEST 2005 root@sisyphos.foobar.ath.cx:/usr/obj/mnt/var/src/sys/SISYPHOS i386 >Description: Fix hard-coded paths, as advised by Kris Kennaway. Please see also ports/85169 which is ignored since >2 months. Just in case: I would be happy to take maintainership of it. >How-To-Repeat: >Fix: --- x11-themes__gtk_industrial_theme.diff begins here --- diff -rN -u old-gtk-industrial-theme/files/Makefile-gtk1 new-gtk-industrial-theme/files/Makefile-gtk1 --- old-gtk-industrial-theme/files/Makefile-gtk1 2005-10-22 22:51:34.000000000 +0200 +++ new-gtk-industrial-theme/files/Makefile-gtk1 2005-10-22 22:51:34.000000000 +0200 @@ -3,28 +3,26 @@ CXX = c++ CXXCPP = c++ -E GDK_PIXBUF_CFLAGS = `$(GDK_PIXBUF_CONFIG) --cflags` -GDK_PIXBUF_CONFIG = /usr/X11R6/bin/gdk-pixbuf-config GDK_PIXBUF_LIBS = `$(GDK_PIXBUF_CONFIG) --libs` GTK_CFLAGS = `$(GTK_CONFIG) --cflags` -GTK_CONFIG = /usr/X11R6/bin/gtk12-config GTK_LIBS = `$(GTK_CONFIG) --libs` -LIBTOOL = libtool LN_S = ln -s INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS) -libdir=/usr/X11R6/lib -enginedir = $(libdir)/gtk/themes/engines +XLIBDIR=$(X11BASE)/lib +LOCALLIBDIR=$(LOCALBASE)/lib +enginedir = $(XLIBDIR)/gtk/themes/engines engine_LTLIBRARIES = libindustrial.la libindustrial_la_LDFLAGS = -module -avoid-version libindustrial_la_LIBADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) EXTRA_DIST = raleigh_dot.c LTLIBRARIES = $(engine_LTLIBRARIES) -CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include -D_GETOPT_H -D_THREAD_SAFE +CPPFLAGS = -I$(XLIBDIR) -I$(LOCALLIBDIR) -D_GETOPT_H -D_THREAD_SAFE LDFLAGS = -LIBS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib +LIBS = -Wl,-export-dynamic -L$(XLIBDIR) -L$(LOCALLIBDIR) libindustrial_la_DEPENDENCIES = libindustrial_la_OBJECTS = industrial1_theme_main.lo \ industrial_style.lo -CFLAGS = -O2 +CFLAGS ?= -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) CCLD = $(CC) --- x11-themes__gtk_industrial_theme.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: