Date: Sat, 22 Oct 2005 23:14:32 +0200 From: Frank Ruell <stoerte@dreamwarrior.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87852: [maintainer-patch] x11-themes/gtk-industrial-theme - remove hard-coded paths Message-ID: <E1ETQhE-000P4H-8j@sisyphos.foobar.ath.cx> Resent-Message-ID: <200510222120.j9MLKKjq013937@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1ETQhE-000P4H-8j>