diff options
author | Ade Lovett <ade@FreeBSD.org> | 2002-02-08 19:03:10 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2002-02-08 19:03:10 +0000 |
commit | 8391c5a4922feb1fc5d905a138a1b96756569ec7 (patch) | |
tree | fc082970f7b1dcaff18f052cb96baa206df9eee2 /devel/glib20 | |
parent | IPv6->iPv4 fallback patches from mozilla-current. (diff) |
glibconfig.h was getting installed in /, rather than below PREFIX
and was being compensated for by a post-install target.
Fix the underlying problem, bumping PORTREVISION.
Notes
Notes:
svn path=/head/; revision=54394
Diffstat (limited to 'devel/glib20')
-rw-r--r-- | devel/glib20/Makefile | 4 | ||||
-rw-r--r-- | devel/glib20/files/patch-ag | 21 |
2 files changed, 7 insertions, 18 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index ca5d22fcf75f..4739bb5ba774 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -7,6 +7,7 @@ PORTNAME= glib PORTVERSION= 1.3.12 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -39,7 +40,4 @@ pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' -post-install: - ${INSTALL_DATA} ${WRKSRC}/glibconfig.h ${PREFIX}/include/glib-2.0 - .include <bsd.port.mk> diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag index a73c1cf91a6b..3e8fbfbf46e2 100644 --- a/devel/glib20/files/patch-ag +++ b/devel/glib20/files/patch-ag @@ -1,23 +1,14 @@ - -$FreeBSD$ - ---- Makefile.in.orig Fri Jan 18 09:43:54 2002 -+++ Makefile.in Fri Jan 18 09:45:49 2002 -@@ -149,7 +149,7 @@ - - AUTOMAKE_OPTIONS = 1.4 +--- Makefile.in.orig Sun Dec 23 16:53:53 2001 ++++ Makefile.in Fri Feb 8 12:44:30 2002 +@@ -151,3 +151,3 @@ -SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs +SUBDIRS = . m4macros glib gobject gmodule gthread build po docs - bin_SCRIPTS = glib-gettextize - -@@ -191,7 +191,7 @@ - glib-zip - +@@ -192,4 +192,4 @@ +- -configexecincludedir = $(libdir)/glib-2.0/include ++glibincludedir = $(includedir)/glib-2.0 +configexecincludedir = $(glibincludedir) - CONFIGURE_DEPENDENCIES = acglib.m4 - |