Verified Commit 51377421 authored by Charlie Li's avatar Charlie Li
Browse files

Revert "textproc/libxml2*: update to 2.15.1, split -core" 

The design of this update was repeatedly rejected in the linked PR
with a prescribed different design. This commit is therefore
unauthorised.

This reverts commit 099bd713.

With hat: desktop (textproc/libxml2), gnome (USES=gnome)
PR: 291316
parent ab3c22de

Mk/Uses/gnome.mk

+3 −3
Original line number Diff line number Diff line
@@ -204,9 +204,9 @@ libidl_USE_GNOME_IMPL= glib20 
libglade2_LIB_DEPENDS=	libglade-2.0.so:devel/libglade2

libglade2_USE_GNOME_IMPL=libxml2 gtk20



libxml2_BUILD_DEPENDS=	xml2-config:textproc/libxml2-core

libxml2_LIB_DEPENDS=	libxml2.so:textproc/libxml2-core

libxml2_RUN_DEPENDS=	libxml2>=0:textproc/libxml2

libxml2_BUILD_DEPENDS=	xml2-config:textproc/libxml2

libxml2_LIB_DEPENDS=	libxml2.so:textproc/libxml2

libxml2_RUN_DEPENDS=	xml2-config:textproc/libxml2



libxslt_BUILD_DEPENDS=	xsltproc:textproc/libxslt

libxslt_LIB_DEPENDS=	libxslt.so:textproc/libxslt

UPDATING

+0 −12
Original line number Diff line number Diff line
@@ -5,18 +5,6 @@ they are unavoidable. 
You should get into the habit of checking this file for changes each time

you update your ports collection, before attempting any port upgrades.



20260126:

  AFFECTS: users of textproc/libxml2

  AUTHOR: mandree@FreeBSD.org



  The libxml2 port has been split in two, to avoid a new circular dependency

  through libxslt when building the documentation.  The libxml2-core port

  now contains the library and libxml2 the documentation.

  This should be mostly automatically handled by the framework;

  if installing libxml2-core now causes trouble in ports,

  build libxml2-core, then pkg delete -f libxml2, then install

  libxml2-core, and then proceed with your updates.



20260125:

  AFFECTS: users of dns/ddclient

  AUTHOR: mjl@luckie.org.nz

textproc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ 
    SUBDIR += libxml++26

    SUBDIR += libxml++30

    SUBDIR += libxml2

    SUBDIR += libxml2-core

    SUBDIR += libxml2-python

    SUBDIR += libxmlb

    SUBDIR += libxmlbird

textproc/libxml2-core/Makefile

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
PORTNAME?=	libxml2

DISTVERSION=	2.15.1

CATEGORIES?=	textproc gnome

MASTER_SITES=	GNOME

PKGNAMESUFFIX?=	-core

DISTNAME=	libxml2-${DISTVERSION}

DIST_SUBDIR=	gnome



MAINTAINER=	desktop@FreeBSD.org

COMMENT?=	XML parser library for GNOME

WWW=		http://xmlsoft.org/



LICENSE=	MIT



# Upstream recommends autotools on Unix-like systems

USES+=			cpe gmake iconv libtool localbase pathfix pkgconfig \

			tar:xz

CPE_VENDOR=		xmlsoft

USE_LDCONFIG=		yes

GNU_CONFIGURE=		yes

# Don't build with Python support unless requested

CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/



PATCH_STRIP=		-p1



INSTALL_TARGET=	install-strip

TEST_TARGET=	check



OPTIONS_DEFINE=		DOCS ICU PYTHON READLINE STATIC THREAD_ALLOC

OPTIONS_GROUP=		LEGACY

OPTIONS_GROUP_LEGACY=	HTTP ZLIB

OPTIONS_DEFAULT=	HTTP READLINE STATIC ZLIB

OPTIONS_SUB=		yes

# note: no DOCS - built by ../libxml2 instead, to

# avoid a circular dependency. libxml2 2.15.0 requires

# xsltproc (provided by libxslt, which depends on libxml2)

OPTIONS_EXCLUDE?=	DOCS PYTHON



HTTP_DESC=		HTTP support

LEGACY_DESC=		Enable legacy API compatibility

READLINE_DESC=		History for xmllint

THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)



DOCS_BUILD_DEPENDS=		doxygen:devel/doxygen

DOCS_CONFIGURE_WITH=		docs

HTTP_CONFIGURE_WITH=		http

ICU_LIB_DEPENDS=		libicuuc.so:devel/icu

ICU_CONFIGURE_WITH=		icu

PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}

PYTHON_BUILD_DEPENDS=		doxygen:devel/doxygen

READLINE_LIB_DEPENDS=		libreadline.so:devel/readline

READLINE_CONFIGURE_WITH=	history readline

STATIC_CONFIGURE_ENABLE=	static

THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc

ZLIB_CONFIGURE_WITH=		zlib



.include <bsd.port.options.mk>



.if empty(PORT_OPTIONS:MDOCS)

CONFIGURE_ARGS+=	--without-docs

.endif



.if empty(PORT_OPTIONS:MPYTHON)

CONFIGURE_ARGS+=	--without-python

.endif



.include <bsd.port.mk>

textproc/libxml2-core/distinfo

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1767355197

SHA256 (gnome/libxml2-2.15.1.tar.xz) = c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c

SIZE (gnome/libxml2-2.15.1.tar.xz) = 2004588