[Midnightbsd-cvs] mports [17601] trunk/Mk/extensions/gnome.mk: drop the ltverhack
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 27 17:31:09 EDT 2014
Revision: 17601
http://svnweb.midnightbsd.org/mports/?rev=17601
Author: laffer1
Date: 2014-09-27 17:31:08 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
drop the ltverhack
Modified Paths:
--------------
trunk/Mk/extensions/gnome.mk
Modified: trunk/Mk/extensions/gnome.mk
===================================================================
--- trunk/Mk/extensions/gnome.mk 2014-09-27 21:24:58 UTC (rev 17600)
+++ trunk/Mk/extensions/gnome.mk 2014-09-27 21:31:08 UTC (rev 17601)
@@ -53,8 +53,8 @@
#
# non-version specific components
-_USE_GNOME_ALL= esound intlhack intltool introspection ltasneededhack lthack \
- ltverhack gnomehack referencehack gnomehier gnomemimedata \
+_USE_GNOME_ALL= esound intlhack intltool introspection \
+ gnomehack referencehack gnomehier gnomemimedata \
gnomeprefix
# GNOME 1 components
@@ -101,9 +101,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_BUILD_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
@@ -192,14 +189,14 @@
esound_MAKE_ENV= ESD_CONFIG="${ESD_CONFIG}"
esound_DETECT= ${ESD_CONFIG}
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-glib12_LIB_DEPENDS= libglib-12.so:${PORTSDIR}/devel/glib12
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib-config
+glib12_LIB_DEPENDS= libglib.so:${PORTSDIR}/devel/glib12
glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
glib12_DETECT= ${GLIB_CONFIG}
-GTK_CONFIG?= ${LOCALBASE}/bin/gtk12-config
-gtk12_LIB_DEPENDS= libgtk-12.so:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${LOCALBASE}/bin/gtk-config
+gtk12_LIB_DEPENDS= libgtk.so:${PORTSDIR}/x11-toolkits/gtk12
gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
gtk12_DETECT= ${GTK_CONFIG}
@@ -466,11 +463,13 @@
intltool_DETECT= ${LOCALBASE}/bin/intltool-extract
intltool_BUILD_DEPENDS= ${intltool_DETECT}:${PORTSDIR}/textproc/intltool
-intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
- s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
- s|/usr/bin/iconv|${ICONV_CMD}|g ; \
- s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|'
+intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \
+ 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
+ s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
+ s|/usr/bin/iconv|${ICONV_CMD}|g ; \
+ s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' ; \
+ ${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \
+ 's/DATADIRNAME=lib/DATADIRNAME=share/'
intlhack_USE_GNOME_IMPL=intltool
gtkhtml3_LIB_DEPENDS= libgtkhtml-3.14.so:${PORTSDIR}/www/gtkhtml3
@@ -678,61 +677,6 @@
PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" \
GTK3_VERSION="${GTK3_VERSION}"
-# 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)
-lthacks_CONFIGURE_ENV= ac_cv_path_DOLT_BASH=
-lthacks_PRE_PATCH= \
- ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \
- ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \
- for file in ${LIBTOOLFILES}; do \
- ${REINPLACE_CMD} -e \
- '/^ltmain=/!s|$$ac_aux_dir/ltmain\.sh|${LIBTOOLFLAGS} ${WRKDIR}/gnome-ltmain.sh|g; \
- /^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/}==""
-ltverhack_LIB_VERSION= major=.`expr $$current - $$age`
-.else
-ltverhack_LIB_VERSION= major=".${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}"
-.endif
-
-.if defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*}
-ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
-ltverhack_PATCH_FILES= ../gnome-ltmain.sh ../gnome-libtool
-.else
-ltverhack_PATCH_FILES?= ltmain.sh libtool
-.endif
-
-ltverhack_PRE_PATCH= \
- for file in ${ltverhack_PATCH_FILES}; do \
- if [ -f ${WRKSRC}/$$file ]; then \
- ${REINPLACE_CMD} -e \
- '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \
- /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \
- -e \
- '/freebsd-elf)/,/;;/ s|major=\.$$current|${ltverhack_LIB_VERSION}|; \
- /freebsd-elf)/,/;;/ s|versuffix=\.$$current|versuffix="$$major"|' \
- ${WRKSRC}/$$file; \
- 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
@@ -742,22 +686,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*}!= ""
-_GNOME_NEED_LIBTOOL=1
-. endif
-. endif
-
-. if defined(_GNOME_NEED_LIBTOOL)
-GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH}
-CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV}
-. endif
-
. for component in ${_USE_GNOME:O:u}
. if defined(${component}_PATCH_DEPENDS)
PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS}
More information about the Midnightbsd-cvs
mailing list