In addition to PREFIX/libdata/pkgconfig scan appropriate directory under
LOCALBASE and X11BASE for .pc files, so ports that live in X11BASE will be able to use pkgconfig.
This commit is contained in:
parent
644ca3887a
commit
cb2d1f7fd6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42028
8 changed files with 60 additions and 6 deletions
|
@ -21,11 +21,13 @@ LIBTOOLFILES= configure glib-1.2.8/configure
|
|||
LIBTOOLFLAGS= --disable-ltlibs \
|
||||
--disable-shared
|
||||
|
||||
PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
|
||||
|
||||
MAN1= pkg-config.1
|
||||
|
||||
post-extract:
|
||||
@${RM} -rf ${WRKSRC}/glib-1.2.8
|
||||
@${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \
|
||||
@${CP} -R ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \
|
||||
${WRKSRC}/glib-1.2.8
|
||||
|
||||
post-install:
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- Makefile.in 2001/04/29 10:36:36 1.1
|
||||
+++ Makefile.in 2001/04/29 10:37:03
|
||||
--- Makefile.in.orig Wed Jan 3 11:39:15 2001
|
||||
+++ Makefile.in Sun Apr 29 14:40:59 2001
|
||||
@@ -35,7 +35,7 @@
|
||||
DESTDIR =
|
||||
|
||||
|
@ -12,3 +12,12 @@ $FreeBSD$
|
|||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = .
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
bin_PROGRAMS = pkg-config
|
||||
|
||||
-INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" -I./glib-1.2.8
|
||||
+INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" -DXPKGLIBDIR="\"$(X11BASE)/libdata/@PACKAGE@\"" -DLPKGLIBDIR="\"$(LOCALBASE)/libdata/@PACKAGE@\"" -I./glib-1.2.8
|
||||
|
||||
pkg_config_SOURCES = pkg.h pkg.c partial-glib.h partial-glib.c parse.h parse.c main.c findme.c findme.h popt.c popt.h poptconfig.c popthelp.c poptint.h poptparse.c
|
||||
|
||||
|
|
14
devel/pkg-config/files/patch-pkg.c
Normal file
14
devel/pkg-config/files/patch-pkg.c
Normal file
|
@ -0,0 +1,14 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- pkg.c 2001/04/29 11:38:41 1.1
|
||||
+++ pkg.c 2001/04/29 11:39:06
|
||||
@@ -97,6 +97,8 @@
|
||||
|
||||
g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
|
||||
scan_dir (PKGLIBDIR);
|
||||
+ scan_dir (XPKGLIBDIR);
|
||||
+ scan_dir (LPKGLIBDIR);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
@exec mkdir -p %D/libdata/pkgconfig
|
||||
bin/pkg-config
|
||||
@dirrm libdata/pkgconfig
|
||||
@unexec rmdir %%LOCALBASE%%/libdata/pkgconfig 2>/dev/null || true
|
||||
@unexec rmdir %%X11BASE%%/libdata/pkgconfig 2>/dev/null || true
|
||||
|
|
|
@ -21,11 +21,13 @@ LIBTOOLFILES= configure glib-1.2.8/configure
|
|||
LIBTOOLFLAGS= --disable-ltlibs \
|
||||
--disable-shared
|
||||
|
||||
PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
|
||||
|
||||
MAN1= pkg-config.1
|
||||
|
||||
post-extract:
|
||||
@${RM} -rf ${WRKSRC}/glib-1.2.8
|
||||
@${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \
|
||||
@${CP} -R ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \
|
||||
${WRKSRC}/glib-1.2.8
|
||||
|
||||
post-install:
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- Makefile.in 2001/04/29 10:36:36 1.1
|
||||
+++ Makefile.in 2001/04/29 10:37:03
|
||||
--- Makefile.in.orig Wed Jan 3 11:39:15 2001
|
||||
+++ Makefile.in Sun Apr 29 14:40:59 2001
|
||||
@@ -35,7 +35,7 @@
|
||||
DESTDIR =
|
||||
|
||||
|
@ -12,3 +12,12 @@ $FreeBSD$
|
|||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = .
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
bin_PROGRAMS = pkg-config
|
||||
|
||||
-INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" -I./glib-1.2.8
|
||||
+INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" -DXPKGLIBDIR="\"$(X11BASE)/libdata/@PACKAGE@\"" -DLPKGLIBDIR="\"$(LOCALBASE)/libdata/@PACKAGE@\"" -I./glib-1.2.8
|
||||
|
||||
pkg_config_SOURCES = pkg.h pkg.c partial-glib.h partial-glib.c parse.h parse.c main.c findme.c findme.h popt.c popt.h poptconfig.c popthelp.c poptint.h poptparse.c
|
||||
|
||||
|
|
14
devel/pkgconfig/files/patch-pkg.c
Normal file
14
devel/pkgconfig/files/patch-pkg.c
Normal file
|
@ -0,0 +1,14 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- pkg.c 2001/04/29 11:38:41 1.1
|
||||
+++ pkg.c 2001/04/29 11:39:06
|
||||
@@ -97,6 +97,8 @@
|
||||
|
||||
g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
|
||||
scan_dir (PKGLIBDIR);
|
||||
+ scan_dir (XPKGLIBDIR);
|
||||
+ scan_dir (LPKGLIBDIR);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
@exec mkdir -p %D/libdata/pkgconfig
|
||||
bin/pkg-config
|
||||
@dirrm libdata/pkgconfig
|
||||
@unexec rmdir %%LOCALBASE%%/libdata/pkgconfig 2>/dev/null || true
|
||||
@unexec rmdir %%X11BASE%%/libdata/pkgconfig 2>/dev/null || true
|
||||
|
|
Loading…
Reference in a new issue