ports/146192: port devel/gobject-introspection variable expansion error

[J.R. Oldroyd]

>Number:         146192
>Category:       ports
>Synopsis:       port devel/gobject-introspection variable expansion error
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 30 18:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD xx.opal.com 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #5: Fri Apr 16 09:02:36 EDT 2010 xx at xx.opal.com:/usr/src/sys/amd64/compile/XX amd64
>Description:
This port has Makefiles that use the varaible "$$PYTHONPATH".  This is not a valid
expansion in this context - it picks up the value of a variable "$P" should it exist
rather than "$PYTHONPATH" as intended.

The proper syntax is "$$(PYTHONPATH)".
>How-To-Repeat:
export P="foobar"
make
watch it fail
>Fix:
--- common.mk.orig	2009-12-14 18:00:16.000000000 -0500
+++ common.mk	2010-04-26 12:12:34.000000000 -0400
@@ -1,5 +1,5 @@
 SCANNER_BIN = $(top_builddir)/tools/g-ir-scanner
-SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
+SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$(PYTHONPATH)
 SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
 	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
--- gir/Makefile.in.orig	2010-04-26 12:06:28.000000000 -0400
+++ gir/Makefile.in	2010-04-26 12:07:20.000000000 -0400
@@ -292,7 +292,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SCANNER_BIN = $(top_builddir)/tools/g-ir-scanner
-SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
+SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$(PYTHONPATH)
 SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
 	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
@@ -359,13 +359,12 @@
 GLib_2_0_gir_PACKAGES = glib-2.0
 GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
             -I$(GLIB_INCLUDEDIR) \
-            -I$(GLIB_LIBDIR)/glib-2.0/include \
             -DGETTEXT_PACKAGE=Dummy \
             -D__G_I18N_LIB_H__
 
 GLib_2_0_gir_ASSERTIONS = $(srcdir)/GLib-2.0.xpath
 GLib_2_0_gir_FILES = \
-                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
+                $(GLIB_INCLUDEDIR)/glibconfig.h \
             $(GLIB_INCLUDEDIR)/glib/*.h \
                 $(srcdir)/glib-2.0.c
 
--- tests/offsets/Makefile.in.orig	2010-04-26 12:13:13.000000000 -0400
+++ tests/offsets/Makefile.in	2010-04-26 12:16:34.000000000 -0400
@@ -277,7 +277,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SCANNER_BIN = $(top_builddir)/tools/g-ir-scanner
-SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
+SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$(PYTHONPATH)
 SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
 	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
--- tests/scanner/Makefile.in.orig	2010-04-26 12:13:13.000000000 -0400
+++ tests/scanner/Makefile.in	2010-04-26 12:15:31.000000000 -0400
@@ -304,7 +304,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SCANNER_BIN = $(top_builddir)/tools/g-ir-scanner
-SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
+SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$(PYTHONPATH)
 SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
 	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
>Release-Note:
>Audit-Trail:
>Unformatted: