diff options
| author | ade <ade@FreeBSD.org> | 2001-05-24 09:48:32 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2001-05-24 09:48:32 +0800 |
| commit | e30daf5c65269ba234a4198c8363d43ac3d03e37 (patch) | |
| tree | 06a36b74d00752bc5d20cbad5f11c6262fdd0234 | |
| parent | 874b53c16ddccccf4f325c30c83817d56343bec7 (diff) | |
| download | freebsd-ports-gnome-e30daf5c65269ba234a4198c8363d43ac3d03e37.tar.gz freebsd-ports-gnome-e30daf5c65269ba234a4198c8363d43ac3d03e37.tar.zst freebsd-ports-gnome-e30daf5c65269ba234a4198c8363d43ac3d03e37.zip | |
Rework previous commit. Turns out that pkgconfig is not a build-time
dependency for glib12, so remove that, and put pkgconfig back to the
way it was before.
| -rw-r--r-- | devel/glib12/Makefile | 3 | ||||
| -rw-r--r-- | devel/pkg-config/Makefile | 7 | ||||
| -rw-r--r-- | devel/pkg-config/distinfo | 1 | ||||
| -rw-r--r-- | devel/pkgconfig/Makefile | 7 | ||||
| -rw-r--r-- | devel/pkgconfig/distinfo | 1 |
5 files changed, 9 insertions, 10 deletions
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index 0d8833b96f08..d9e4fa00cfd4 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -7,12 +7,11 @@ PORTNAME= glib PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/glib -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig MAINTAINER= gnome@FreeBSD.org diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 96ba5f6b1a3d..c618e1ec5fab 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -7,14 +7,14 @@ PORTNAME= pkgconfig PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org -DISTFILES= pkgconfig-0.5.0.tar.gz glib-1.2.10.tar.gz +BUILD_DEPENDS= /nonexistent:${PORTSDIR}/devel/glib12:patch USE_GMAKE= yes USE_LIBTOOL= yes @@ -28,7 +28,8 @@ MAN1= pkg-config.1 post-extract: @${RM} -rf ${WRKSRC}/glib-1.2.8 - @${CP} -R ${WRKSRC}/../glib-1.2* ${WRKSRC}/glib-1.2.8 + @${CP} -R ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \ + ${WRKSRC}/glib-1.2.8 post-install: ${MKDIR} ${PREFIX}/libdata/pkgconfig diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 23165af3eaaf..c29b00edb0e9 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,2 +1 @@ MD5 (pkgconfig-0.5.0.tar.gz) = 84b14fbf4b5dbd8b35b2d8cde87aea11 -MD5 (glib-1.2.10.tar.gz) = 6fe30dad87c77b91b632def29dd69ef9 diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 96ba5f6b1a3d..c618e1ec5fab 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -7,14 +7,14 @@ PORTNAME= pkgconfig PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org -DISTFILES= pkgconfig-0.5.0.tar.gz glib-1.2.10.tar.gz +BUILD_DEPENDS= /nonexistent:${PORTSDIR}/devel/glib12:patch USE_GMAKE= yes USE_LIBTOOL= yes @@ -28,7 +28,8 @@ MAN1= pkg-config.1 post-extract: @${RM} -rf ${WRKSRC}/glib-1.2.8 - @${CP} -R ${WRKSRC}/../glib-1.2* ${WRKSRC}/glib-1.2.8 + @${CP} -R ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \ + ${WRKSRC}/glib-1.2.8 post-install: ${MKDIR} ${PREFIX}/libdata/pkgconfig diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index 23165af3eaaf..c29b00edb0e9 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1,2 +1 @@ MD5 (pkgconfig-0.5.0.tar.gz) = 84b14fbf4b5dbd8b35b2d8cde87aea11 -MD5 (glib-1.2.10.tar.gz) = 6fe30dad87c77b91b632def29dd69ef9 |