Date: Fri, 25 Apr 2014 00:11:48 +0200 (CEST) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/188978: [patch] Mk/bsd.gnome.mk: remove USE_GNOME=lthack Message-ID: <201404242211.s3OMBmLA023893@kalimero.tijl.coosemans.org> Resent-Message-ID: <201404242220.s3OMK0Kb070248@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188978 >Category: ports >Synopsis: [patch] Mk/bsd.gnome.mk: remove USE_GNOME=lthack >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 24 22:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 11.0-CURRENT i386 >Organization: >Environment: >Description: This patch depends on ports/188972 and ports/188975. The attached patch removes USE_GNOME=lthack and USE_MATE=lthack. All ports that used it have been converted to USES=libtool. The patch removes the last occurance from textproc/py-libxslt and converts it together with textproc/libxslt to USES=libtool. Redports: https://redports.org/buildarchive/20140424115801-15180/ >How-To-Repeat: >Fix: --- libxslt.patch begins here --- Index: Mk/bsd.gnome.mk =================================================================== --- Mk/bsd.gnome.mk (revision 352018) +++ Mk/bsd.gnome.mk (working copy) @@ -68,7 +68,7 @@ Gnome_Pre_Include= bsd.gnome.mk # # non-version specific components -_USE_GNOME_ALL= esound intlhack intltool introspection ltasneededhack lthack \ +_USE_GNOME_ALL= esound intlhack intltool introspection ltasneededhack \ ltverhack gnomehack referencehack gnomehier gnomemimedata \ gnomeprefix @@ -116,9 +116,6 @@ gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} - 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 Index: Mk/bsd.mate.mk =================================================================== --- Mk/bsd.mate.mk (revision 352018) +++ Mk/bsd.mate.mk (working copy) @@ -42,7 +42,7 @@ Mate_Pre_Include= bsd.mate.mk # # 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 ltasneededhack 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 @@ _USE_MATE_ALL+= caja common controlcente 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 Index: textproc/libxslt/Makefile =================================================================== --- textproc/libxslt/Makefile (revision 352018) +++ textproc/libxslt/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libxslt PORTVERSION= 1.1.28 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ @@ -15,10 +15,10 @@ COMMENT?= The XSLT C library for GNOME .if !defined(REFERENCE_PORT) -USES= gmake GNU_CONFIGURE= yes +USES= gmake libtool:oldver pathfix +USE_GNOME?= libxml2 USE_LDCONFIG= yes -USE_GNOME?= gnomehack libxml2 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python CPPFLAGS+= -I${LOCALBASE}/include Index: textproc/py-libxslt/Makefile =================================================================== --- textproc/py-libxslt/Makefile (revision 352018) +++ textproc/py-libxslt/Makefile (working copy) @@ -13,10 +13,8 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USES= pathfix -USE_GNOME= lthack libxslt +USE_GNOME= libxslt USE_PYTHON= yes -USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-python=${PYTHON_CMD} --- libxslt.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404242211.s3OMBmLA023893>