diff options
| author | marcus <marcus@FreeBSD.org> | 2004-12-28 11:26:25 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-12-28 11:26:25 +0800 |
| commit | 75ca99bb6a43e9cdf2cd1f68e8ab63fb4aa2bf1e (patch) | |
| tree | 4bbecf21e45c2c71d2ecb00c0f7420676db594db | |
| parent | 082253bb895e994b14e6df75744c0ac111a4db5b (diff) | |
| download | freebsd-ports-gnome-75ca99bb6a43e9cdf2cd1f68e8ab63fb4aa2bf1e.tar.gz freebsd-ports-gnome-75ca99bb6a43e9cdf2cd1f68e8ab63fb4aa2bf1e.tar.zst freebsd-ports-gnome-75ca99bb6a43e9cdf2cd1f68e8ab63fb4aa2bf1e.zip | |
${X11BASE}/libdata/pkgconfig was added to mtree, so we no longer need to
handle it here.
Reported by: pointyhat via kris
| -rw-r--r-- | devel/pkg-config/Makefile | 2 | ||||
| -rw-r--r-- | devel/pkg-config/pkg-plist | 3 | ||||
| -rw-r--r-- | devel/pkgconfig/Makefile | 2 | ||||
| -rw-r--r-- | devel/pkgconfig/pkg-plist | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 908b51dfe664..85f974a5103a 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -25,7 +25,7 @@ LIBTOOLFLAGS= --disable-ltlibs \ CONFIGURE_ARGS= --disable-threads MAKE_ENV= PKGCONF_BUILD=yes -PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} +PLIST_SUB= LOCALBASE=${LOCALBASE} MAN1= pkg-config.1 diff --git a/devel/pkg-config/pkg-plist b/devel/pkg-config/pkg-plist index d56d4b925198..eb5051550db8 100644 --- a/devel/pkg-config/pkg-plist +++ b/devel/pkg-config/pkg-plist @@ -4,6 +4,5 @@ share/aclocal/pkg.m4 @comment The files in these directories should only be removed if you @comment remove the complete GNOME installation. If this is only an @comment upgrade, don't throw them out! -@unexec echo "If you are only upgrading, do not remove %%LOCALBASE%%/libdata/pkgconfig or %%X11BASE%%/libdata/pkgconfig" +@unexec echo "If you are only upgrading, do not remove %%LOCALBASE%%/libdata/pkgconfig" @unexec rmdir %%LOCALBASE%%/libdata/pkgconfig 2>/dev/null || true -@unexec rmdir %%X11BASE%%/libdata/pkgconfig 2>/dev/null || true diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 908b51dfe664..85f974a5103a 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -25,7 +25,7 @@ LIBTOOLFLAGS= --disable-ltlibs \ CONFIGURE_ARGS= --disable-threads MAKE_ENV= PKGCONF_BUILD=yes -PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} +PLIST_SUB= LOCALBASE=${LOCALBASE} MAN1= pkg-config.1 diff --git a/devel/pkgconfig/pkg-plist b/devel/pkgconfig/pkg-plist index d56d4b925198..eb5051550db8 100644 --- a/devel/pkgconfig/pkg-plist +++ b/devel/pkgconfig/pkg-plist @@ -4,6 +4,5 @@ share/aclocal/pkg.m4 @comment The files in these directories should only be removed if you @comment remove the complete GNOME installation. If this is only an @comment upgrade, don't throw them out! -@unexec echo "If you are only upgrading, do not remove %%LOCALBASE%%/libdata/pkgconfig or %%X11BASE%%/libdata/pkgconfig" +@unexec echo "If you are only upgrading, do not remove %%LOCALBASE%%/libdata/pkgconfig" @unexec rmdir %%LOCALBASE%%/libdata/pkgconfig 2>/dev/null || true -@unexec rmdir %%X11BASE%%/libdata/pkgconfig 2>/dev/null || true |