Date: Sat, 26 Apr 2014 01:30:00 GMT From: Mark Linimon <linimon@lonesome.com> To: gnome@FreeBSD.org Subject: Re: ports/188978: [patch] Mk/bsd.gnome.mk: remove USE_GNOME=lthack Message-ID: <201404260130.s3Q1U0lU006120@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/188978; it has been noted by GNATS.
From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/188978: [patch] Mk/bsd.gnome.mk: remove USE_GNOME=lthack
Date: Fri, 25 Apr 2014 20:21:33 -0500
----- Forwarded message from Baptiste Daroussin <bapt@FreeBSD.org> -----
Date: Fri, 25 Apr 2014 12:27:26 +0200
From: Baptiste Daroussin <bapt@FreeBSD.org>
To: freebsd-ports-bugs@FreeBSD.org, gnome@FreeBSD.org
Subject: Re: ports/188978: [patch] Mk/bsd.gnome.mk: remove USE_GNOME=lthack
User-Agent: Mutt/1.5.23 (2014-03-12)
libxslt has part has been committed
here is an updated version of the patch that removes the ltasneededhack as well:
it is not in use anymore.
regards,
Bapt
Index: Mk/bsd.gnome.mk
===================================================================
--- Mk/bsd.gnome.mk (révision 352085)
+++ Mk/bsd.gnome.mk (copie de travail)
@@ -68,7 +68,7 @@
#
# non-version specific components
-_USE_GNOME_ALL= esound intlhack intltool introspection ltasneededhack lthack \
+_USE_GNOME_ALL= esound intlhack intltool introspection \
ltverhack gnomehack referencehack gnomehier gnomemimedata \
gnomeprefix
@@ -116,9 +116,6 @@
referencehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
"s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|"
-lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
- '/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
-
GNOME_MTREE_FILE?= ${LOCALBASE}/etc/mtree/BSD.gnome.dist
gnomehier_DETECT= ${GNOME_MTREE_FILE}
gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
@@ -704,10 +701,6 @@
/^LIBTOOL=/s|$$(top_builddir)/libtool|${WRKDIR}/gnome-libtool|g' \
${PATCH_WRKSRC}/$$file; \
done;
-.else
-. if ${USE_GNOME:Mltasneededhack}!=""
-IGNORE= cannot install: ${PORTNAME} uses the ltasneededhack GNOME component but does not use libtool
-. endif
.endif
.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}==""
@@ -736,15 +729,6 @@
fi; \
done
-ltasneededhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
-ltasneededhack_PRE_PATCH= \
- if [ -f ${WRKDIR}/gnome-libtool ]; then \
- ${REINPLACE_CMD} -e \
- '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \
- /^archive_expsym_cmds=/s/-shared/-shared -Wl,--as-needed/' \
- ${WRKDIR}/gnome-libtool; \
- fi
-
# Set USE_CSTD for all ports that depend on glib12
.if defined(_USE_GNOME) && !empty(_USE_GNOME:Mglib12)
USE_CSTD= gnu89
@@ -754,10 +738,6 @@
# exist in ${_USE_GNOME} and set variables accordingly
.ifdef _USE_GNOME
-. if ${USE_GNOME:Mltasneededhack}!= ""
-_GNOME_NEED_LIBTOOL=1
-. endif
-
# this is splitted out from the above entry because fmake trows a fit otherwise
. if defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*}
. if ${USE_GNOME:Mltverhack*}!= ""
Index: Mk/bsd.mate.mk
===================================================================
--- Mk/bsd.mate.mk (révision 352085)
+++ Mk/bsd.mate.mk (copie de travail)
@@ -42,7 +42,7 @@
#
# non-version specific components. Do not use :build/:run on those.
-_USE_MATE_ALL= autogen intlhack intltool ltasneededhack lthack ltverhack
+_USE_MATE_ALL= autogen intlhack intltool ltverhack
# These *hack* tools are the same as in bsd.gnome.mk but are run in
# pre-configure because pre-patch is when we run autogen.sh.
@@ -57,9 +57,6 @@
SCROLLKEEPER_DIR= /var/db/rarian
-lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
- '/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
-
caja_DETECT= ${LOCALBASE}/libdata/pkgconfig/libcaja-extension.pc
caja_BUILD_DEPENDS= ${caja_DETECT}:${PORTSDIR}/x11-fm/mate-file-manager
caja_LIB_DEPENDS= libcaja-extension.so:${PORTSDIR}/x11-fm/mate-file-manager
@@ -188,10 +185,6 @@
/^LIBTOOL=/s|$$(top_builddir)/libtool|${WRKDIR}/mate-libtool|g' \
${PATCH_WRKSRC}/$$file; \
done;
-.else
-. if ${USE_MATE:Mltverhack*}!="" || ${USE_MATE:Mltasneededhack}!=""
-IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack MATE components but does not use libtool
-. endif
.endif
.if ${USE_MATE:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}==""
@@ -209,15 +202,6 @@
fi; \
done
-ltasneededhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
-ltasneededhack_PRE_PATCH= if [ -f ${WRKDIR}/mate-libtool ]; then \
- ${REINPLACE_CMD} -e \
- '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \
- /^archive_expsym_cmds=/s/-shared/-shared -Wl,--as-needed/' \
- ${WRKDIR}/mate-libtool; \
- fi
-
-
# Comparing between USE_MATE and _USE_MATE_ALL to make sure the component
# exists in _USE_MATE_ALL. If it does not exist then give an error about it.
#. for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
@@ -228,7 +212,7 @@
. endif
. endfor
-. if ${USE_MATE:Mltverhack*}!= "" || ${USE_MATE:Mltasneededhack}!= ""
+. if ${USE_MATE:Mltverhack*}!= ""
MATE_PRE_PATCH+= ${lthacks_PRE_PATCH}
CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV}
. endif
----- End forwarded message -----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404260130.s3Q1U0lU006120>