diff options
| author | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-09-21 06:56:42 +0800 |
|---|---|---|
| committer | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-09-21 06:56:42 +0800 |
| commit | 01c810409c12a659e42816562ba055f70b4e9b28 (patch) | |
| tree | 601ed5a512fd0120e1a0e5f78871eef941d5a666 /Mk | |
| parent | fabefa6456491c2011e47e11fd2cd94c8e0a4243 (diff) | |
| download | marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.tar marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.tar.gz marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.tar.bz2 marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.tar.lz marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.tar.xz marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.tar.zst marcuscom-ports-01c810409c12a659e42816562ba055f70b4e9b28.zip | |
Add lthack to the list of USE_GNOME macros.
lthack does that thing with $LIBTOOL_DEPS that appears in a jillion
patch-configures.
It'd be neat to add this to gnomehack, but then every port that does it
manually in patch-configure would fail.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1233 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 955e39d50..e8b385560 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -24,7 +24,7 @@ Gnome_Include_MAINTAINER= gnome@FreeBSD.org # As a result proper LIB_DEPENDS/RUN_DEPENDS will be added and CONFIGURE_ENV # and MAKE_ENV defined. -_USE_GNOME_ALL= gnomehack gnomeprefix gnomehier gnomeaudio esound libghttp \ +_USE_GNOME_ALL= gnomehack lthack gnomeprefix gnomehier gnomeaudio esound libghttp \ glib12 gtk12 libxml gdkpixbuf imlib orbit gnomelibs \ gnomecanvas oaf gnomemimedata gconf gnomevfs libcapplet \ gnomeprint bonobo libgda gnomedb libglade gal glibwww gtkhtml \ @@ -53,6 +53,8 @@ gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLA 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' +lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ + '/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|' gnomehier_RUN_DEPENDS= ${X11BASE}/share/gnome/.keep_me:${PORTSDIR}/misc/gnomehier gnomehier_DETECT= ${X11BASE}/share/gnome/.keep_me @@ -537,7 +539,7 @@ CONFIGURE_TARGET= ${${component}_CONFIGURE_TARGET} . endif . if defined(${component}_PRE_PATCH) -GNOME_PRE_PATCH+= ${${component}_PRE_PATCH} +GNOME_PRE_PATCH+= ; ${${component}_PRE_PATCH} . endif . endif @@ -548,7 +550,7 @@ GNOME_PRE_PATCH+= ${${component}_PRE_PATCH} USE_REINPLACE= yes pre-patch: - @${GNOME_PRE_PATCH} + @${GNOME_PRE_PATCH:C/^;//1} .endif .if defined(WANT_GNOME) |