diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:42:21 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:42:21 +0000 |
| commit | 888e973cd3151dec7ddf41489c3bc02f7b43a222 (patch) | |
| tree | a1bfbe9b25a154a486e7336f1557022ee9a65453 /Mk/bsd.gnome.mk | |
| parent | Conversion to a single libtool environment. (diff) | |
As a result of the conversion to single libtool, the glib/gtk 1.2.x
libraries have now moved from <lib>12.so to <lib>-12.so
Approved by: portmgr (kris)
Notes
Notes:
svn path=/head/; revision=156750
Diffstat (limited to 'Mk/bsd.gnome.mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 70845288317d..167459276410 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -118,14 +118,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} @@ -611,14 +611,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 \ |