Sync with ports.

ltverhack & friends has left the building.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19886 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 1 insertions, 56 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index e50cea3ea..2641e20cc 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -69,7 +69,7 @@ Gnome_Pre_Include=			bsd.gnome.mk
 
 # non-version specific components
 _USE_GNOME_ALL= esound intlhack intltool introspection \
-		ltverhack gnomehack referencehack gnomehier gnomemimedata \
+		gnomehack referencehack gnomehier gnomemimedata \
 		gnomeprefix
 
 # GNOME 1 components
@@ -697,48 +697,6 @@ _USE_GNOME+=	${${component}_USE_GNOME_IMPL} ${component}
 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;
-.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
-
 # Set USE_CSTD for all ports that depend on glib12
 .if defined(_USE_GNOME) && !empty(_USE_GNOME:Mglib12)
 USE_CSTD=	gnu89
@@ -748,18 +706,6 @@ USE_CSTD=	gnu89
 # exist in ${_USE_GNOME} and set variables accordingly
 .ifdef _USE_GNOME
 
-# 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}
@@ -899,7 +845,6 @@ gnome-post-install:
 		${ECHO_CMD} "@unexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
 			>> ${TMPPLIST}; \
 	done
-
 	@if test -f ${TMPPLIST}.icons1; then \
 		${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \
 		${RM} -f ${TMPPLIST}.icons1; \