diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-24 00:53:28 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-24 00:53:28 +0800 |
| commit | 850ef41a44b259b76db5c382cb0ba7a19755db77 (patch) | |
| tree | e98cd047059b0878f4ee8dcdfb47f2c419c95a0c | |
| parent | 54b39e4cc2617ceaf978042812698eb023c4573b (diff) | |
| download | marcuscom-ports-850ef41a44b259b76db5c382cb0ba7a19755db77.tar.gz marcuscom-ports-850ef41a44b259b76db5c382cb0ba7a19755db77.tar.zst marcuscom-ports-850ef41a44b259b76db5c382cb0ba7a19755db77.zip | |
Declare the MC tree dirty, and not for use, and start to merge in Ade's
one-true-libtool patch.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5726 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index c8d221b61..a8f3ce94c 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.360 2006/02/04 21:11:43 ahze Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.361 2006/02/04 21:20:24 ahze Exp $ # # Please view me with 4 column tabs! @@ -120,14 +120,14 @@ libghttp_LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp libghttp_DETECT= ${LOCALBASE}/etc/ghttpConf.sh GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -glib12_LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 +glib12_LIB_DEPENDS= glib-12.3:${PORTSDIR}/devel/glib12 glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_DETECT= ${GLIB_CONFIG} glib12_USE_GNOME_IMPL= pkgconfig GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -gtk12_LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +gtk12_LIB_DEPENDS= gtk-12.2:${PORTSDIR}/x11-toolkits/gtk12 gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_DETECT= ${GTK_CONFIG} @@ -626,14 +626,7 @@ _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component} # Then handle the ltverhack component (it has to be done here, because # we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is # included in the post-makefile section). -.if defined(AUTOTOOL_libtool_inc) -ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ - for file in ${LIBTOOLFILES}; do \ - ${REINPLACE_CMD} -e \ - '/^ltmain=/!s|$$ac_aux_dir/ltmain\.sh|${LIBTOOLFLAGS} ${WRKDIR}/gnome-ltmain.sh|g' \ - ${PATCH_WRKSRC}/$$file; \ - done; -.elif defined(AUTOTOOL_libtool) +.if defined(AUTOTOOL_libtool) ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \ for file in ${LIBTOOLFILES}; do \ |