Attachment #232969 for bug #262940





PORTNAME=	libxml2
DISTVERSION=	2.9.13
PORTREVISION?=	1
CATEGORIES?=	textproc gnome
MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
DIST_SUBDIR=	gnome

MAINTAINER=	desktop@FreeBSD.org
COMMENT?=	XML parser library for GNOME

LICENSE=	MIT

USES+=		cpe iconv libtool localbase pathfix pkgconfig tar:xz

CPE_VENDOR=	xmlsoft
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

PLIST_SUB+=	LIBVERSION=${DISTVERSION}

# Don't build with Python support unless requested
CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
			--with-html-subdir=${PORTNAME} \
			--with-lzma=/usr \
			--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}

OPTIONS_DEFINE=	DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC
OPTIONS_DEFAULT=	ICU READLINE
OPTIONS_SUB=		yes

MEM_DEBUG_DESC=		Memory debugging (DEVELOPERS ONLY!)
THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
READLINE_DESC=		History for xmllint
THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)

ICU_LIB_DEPENDS=		libicudata.so:devel/icu
ICU_CONFIGURE_WITH=		icu
MEM_DEBUG_CONFIGURE_WITH=	mem-debug
READLINE_LIB_DEPENDS=		libreadline.so:devel/readline
READLINE_CONFIGURE_WITH=	history \
				readline
THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
TEST_CMAKE_BOOL=	LIBXML2_WITH_TESTS
TEST_TEST_TARGET=	test

post-patch:
.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1


.if !defined(LIBXML2_SLAVE)
post-install:
# Documentation should be in DOCSDIR
	@${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \
		${STAGEDIR}${DOCSDIR}/devhelp
	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
# Install remaining documentation that's not connected to autotools
	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/libxml2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1645459375	1	TIMESTAMP = 1648572316
2	SHA256 (gnome2/libxml2-2.9.13.tar.xz) = 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e	2	SHA256 (gnome/libxml2-2.9.13.tar.xz) = 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
3	SIZE (gnome2/libxml2-2.9.13.tar.xz) = 3243336	3	SIZE (gnome/libxml2-2.9.13.tar.xz) = 3243336

Removed Link Here

(-)a/textproc/libxml2/files/extra-patch-docs (-11 lines)
1	--- CMakeLists.txt.orig 2022-02-22 00:19:24 UTC
2	+++ CMakeLists.txt
3	@@ -650,7 +650,7 @@ endif()
4	install(FILES libxml.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation)
5	install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
6	install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
7	-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE)
8	+#install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE)
9
10	configure_package_config_file(
11	libxml2-config.cmake.cmake.in libxml2-config.cmake




--- CMakeLists.txt.orig	2022-02-19 16:23:47 UTC
+++ CMakeLists.txt
@@ -691,7 +691,7 @@ if(LIBXML2_WITH_PYTHON)
 	configure_file(python/setup.py.in setup.py @ONLY)
 endif()
 
-set(XML_INCLUDEDIR "-I\${includedir}/libxml2")
+set(XML_INCLUDEDIR "-I\${includedir}/libxml2 -I\${includedir}")
 set(XML_LIBDIR "-L\${libdir}")
 set(XML_LIBS "-lxml2")
 set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_LIBS} ${ICONV_LIBS} ${ICU_LIBS} ${M_LIBS}")
@@ -699,14 +699,14 @@ set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_
 file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
 string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
 
-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
+set(prefix ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix "\${prefix}")
 set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
 configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig COMPONENT development)
 
-set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
+set(prefix ${CMAKE_INSTALL_PREFIX})
 configure_file(xml2-config.in xml2-config @ONLY)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development)
 




--- Makefile.in.orig	2021-06-09 19:53:33 UTC
+++ Makefile.in
@@ -760,7 +760,7 @@ man_MANS = xml2-config.1 libxml.3
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libxml.m4
 runtest_SOURCES = runtest.c
-runtest_LDFLAGS = 
+runtest_LDFLAGS = -pthread
 runtest_DEPENDENCIES = $(DEPS)
 runtest_LDADD = $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
 testrecurse_SOURCES = testrecurse.c
@@ -808,7 +808,7 @@ testC14N_LDFLAGS = 
 testC14N_DEPENDENCIES = $(DEPS)
 testC14N_LDADD = $(LDADDS)
 testThreads_SOURCES = testThreads.c
-testThreads_LDFLAGS = 
+testThreads_LDFLAGS = -pthread
 testThreads_DEPENDENCIES = $(DEPS)
 testThreads_LDADD = $(BASE_THREAD_LIBS) $(LDADDS)
 testURI_SOURCES = testURI.c
@@ -1285,7 +1285,7 @@ am--depfiles: $(am__depfiles_remade)
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -1774,7 +1774,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 		config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
@@ -1911,7 +1911,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-cmakeDATA install-data-local \
+install-data-am: install-cmakeDATA \
 	install-m4dataDATA install-man install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive

Added Link Here

(-)b/textproc/libxml2/files/patch-config.h.in (+11 lines)
1	--- config.h.in.orig 2018-03-05 15:54:17 UTC
2	+++ config.h.in
3	@@ -1,5 +1,8 @@
4	/* config.h.in. Generated from configure.ac by autoheader. */
5
6	+/* XXX */
7	+#define HAVE_VFSCANF
8	+
9	/* Type cast for the gethostbyname() argument */
10	#undef GETHOSTBYNAME_ARG_CAST
11

Added Link Here

(-)b/textproc/libxml2/files/patch-configure (+11 lines)
1	--- configure.orig 2019-10-30 19:14:22 UTC
2	+++ configure
3	@@ -15525,6 +15525,8 @@ fi
4	fi
5	fi
6	;;
7	+ freebsd) THREAD_LIBS=""
8	+ ;;
9	esac
10	if test "$WITH_THREADS" = "1" ; then
11	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"

Removed Link Here

(-)a/textproc/libxml2/files/patch-libxml-2.0.pc.in (-11 lines)
1	--- libxml-2.0.pc.in.orig 2022-03-08 22:00:47 UTC
2	+++ libxml-2.0.pc.in
3	@@ -8,6 +8,6 @@ Name: libXML
4	Version: @VERSION@
5	Description: libXML library version2.
6	Requires:
7	-Libs: -L${libdir} -lxml2
8	-Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
9	+Libs: -L${libdir} @XML_LIBS@
10	+Libs.private: @XML_PRIVATE_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
11	Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@




include/libxml2/libxml/xpath.h
include/libxml2/libxml/xpathInternals.h
include/libxml2/libxml/xpointer.h
lib/cmake/libxml2/libxml2-config.cmake
lib/libxml2.a
lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export.cmake
lib/libxml2.so
lib/libxml2.so.2
lib/libxml2.so.%%LIBVERSION%%
lib/xml2Conf.sh
libdata/pkgconfig/libxml-2.0.pc
man/man1/xml2-config.1.gz
man/man1/xmlcatalog.1.gz
man/man1/xmllint.1.gz
man/man3/libxml.3.gz

%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-90x34.gif
%%PORTDOCS%%%%DOCSDIR%%/XMLinfo.html
%%PORTDOCS%%%%DOCSDIR%%/XSLT.html
%%PORTDOCS%%%%DOCSDIR%%/api.xsl
%%PORTDOCS%%%%DOCSDIR%%/apibuild.py
%%PORTDOCS%%%%DOCSDIR%%/architecture.html
%%PORTDOCS%%%%DOCSDIR%%/bugs.html
%%PORTDOCS%%%%DOCSDIR%%/catalog.gif
%%PORTDOCS%%%%DOCSDIR%%/catalog.html
%%PORTDOCS%%%%DOCSDIR%%/checkapisym.xsl
%%PORTDOCS%%%%DOCSDIR%%/contribs.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/devhelp2.xsl
%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/html.xsl
%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-DOCBparser.html

%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
%%PORTDOCS%%%%DOCSDIR%%/docs.html
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
%%PORTDOCS%%%%DOCSDIR%%/elfgcchack.xsl
%%PORTDOCS%%%%DOCSDIR%%/encoding.html
%%PORTDOCS%%%%DOCSDIR%%/entities.html
%%PORTDOCS%%%%DOCSDIR%%/example.html
%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xsl
%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
%%PORTDOCS%%%%DOCSDIR%%/examples/index.py
%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
%%PORTDOCS%%%%DOCSDIR%%/examples/io1.res
%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c

%%PORTDOCS%%%%DOCSDIR%%/html/right.png
%%PORTDOCS%%%%DOCSDIR%%/html/up.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/index.py
%%PORTDOCS%%%%DOCSDIR%%/interface.html
%%PORTDOCS%%%%DOCSDIR%%/intro.html
%%PORTDOCS%%%%DOCSDIR%%/library.html
%%PORTDOCS%%%%DOCSDIR%%/libxml.gif
%%PORTDOCS%%%%DOCSDIR%%/libxml2-api.xml
%%PORTDOCS%%%%DOCSDIR%%/libxml2.xsa
%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
%%PORTDOCS%%%%DOCSDIR%%/newapi.xsl
%%PORTDOCS%%%%DOCSDIR%%/news.html
%%PORTDOCS%%%%DOCSDIR%%/news.xsl
%%PORTDOCS%%%%DOCSDIR%%/python.html
%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
%%PORTDOCS%%%%DOCSDIR%%/search.php
%%PORTDOCS%%%%DOCSDIR%%/searches.html
%%PORTDOCS%%%%DOCSDIR%%/searches.xsl
%%PORTDOCS%%%%DOCSDIR%%/site.xsl
%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
%%PORTDOCS%%%%DOCSDIR%%/structure.gif
%%PORTDOCS%%%%DOCSDIR%%/symbols.xml
%%PORTDOCS%%%%DOCSDIR%%/syms.xsl
%%PORTDOCS%%%%DOCSDIR%%/threads.html
%%PORTDOCS%%%%DOCSDIR%%/tree.html
%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
%%PORTDOCS%%%%DOCSDIR%%/w3c.png
%%PORTDOCS%%%%DOCSDIR%%/wiki.xsl
%%PORTDOCS%%%%DOCSDIR%%/xml.html
%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.html
%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.xml
%%PORTDOCS%%%%DOCSDIR%%/xmldtd.html
%%PORTDOCS%%%%DOCSDIR%%/xmlio.html
%%PORTDOCS%%%%DOCSDIR%%/xmllint.html
%%PORTDOCS%%%%DOCSDIR%%/xmllint.xml
%%PORTDOCS%%%%DOCSDIR%%/xmlmem.html
%%PORTDOCS%%%%DOCSDIR%%/xmlreader.html
%%PORTDOCS%%%%DOCSDIR%%/xsa.xsl




# Created by: Alexander Nedotsukov <bland@FreeBSD.org>

PORTREVISION=	3
CATEGORIES=	textproc gnome python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

COMMENT=	Python interface for XML parser library for GNOME
MASTERDIR=	${.CURDIR}/../libxml2

USES+=		gettext-runtime gnome python:3.6+ shebangfix
USE_GNOME=	libxml2
USE_PYTHON=	autoplist distutils
SHEBANG_FILES=	*.py doc/*.py python/*.py python/tests/*.py

OPTIONS_SLAVE=
# multiple versions are installed
CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}

OPTIONS_SLAVE=	${OPTIONS_DEFINE:NTEST}

# Tell master port we're a slave port
LIBXML2_SLAVE=	python
# Grab pkg-descr from slave port
DESCR=		${.CURDIR}/pkg-descr

BUILD_WRKSRC=	${WRKSRC}/python
INSTALL_WRKSRC=	${BUILD_WRKSRC}

# Don't append pkg-plist from master port
PLIST=

DOCSDIR=	${PREFIX}/share/doc/py-libxml2
EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2
		${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.pyc \
		${PYTHON_SITELIBDIR}/drv_libxml2.py \
		${PYTHON_SITELIBDIR}/libxml2.py \
		${PYTHON_SITELIBDIR}/libxml2mod.so \
		${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}

do-install:
	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
	${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
	${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}
	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}

.include "${MASTERDIR}/Makefile"
- 

Return to bug 262940

Lines 2-44 Link Here

(-)b/textproc/libxml2/Makefile (-21 / +26 lines)
2		2
3	PORTNAME= libxml2	3	PORTNAME= libxml2
4	DISTVERSION= 2.9.13	4	DISTVERSION= 2.9.13
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	CATEGORIES?= textproc gnome	6	CATEGORIES?= textproc gnome
7	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/	7	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
8	DIST_SUBDIR= gnome2	8	DIST_SUBDIR= gnome
9		9
10	MAINTAINER= desktop@FreeBSD.org	10	MAINTAINER= desktop@FreeBSD.org
11	COMMENT?= XML parser library for GNOME	11	COMMENT?= XML parser library for GNOME
12		12
13	LICENSE= MIT	13	LICENSE= MIT
14		14
15	USES+= cmake cpe iconv localbase:ldflags pkgconfig tar:xz	15	USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz
16
17	CPE_VENDOR= xmlsoft	16	CPE_VENDOR= xmlsoft
		17	GNU_CONFIGURE= yes
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
		20	INSTALL_TARGET= install-strip
		21	TEST_TARGET= check
		22
20	PLIST_SUB+= LIBVERSION=${DISTVERSION}	23	PLIST_SUB+= LIBVERSION=${DISTVERSION}
21		24
22	# Don't build with Python support unless requested	25	# Don't build with Python support unless requested
23	CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON	26	CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
		27	--with-html-subdir=${PORTNAME} \
		28	--with-lzma=/usr \
		29	--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}
24		30
25	OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE TEST THREAD_ALLOC	31	OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC
26	OPTIONS_DEFAULT= ICU READLINE	32	OPTIONS_DEFAULT= ICU READLINE
27	OPTIONS_SUB= yes	33	OPTIONS_SUB= yes
28		34
29	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)	35	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
30	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
31	READLINE_DESC= History for xmllint	36	READLINE_DESC= History for xmllint
		37	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
32		38
33	DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-docs	39	ICU_LIB_DEPENDS= libicudata.so:devel/icu
34	ICU_LIB_DEPENDS= libicudata.so:devel/icu	40	ICU_CONFIGURE_WITH= icu
35	ICU_CMAKE_BOOL= LIBXML2_WITH_ICU	41	MEM_DEBUG_CONFIGURE_WITH= mem-debug
36	MEM_DEBUG_CAKE_BOOL= LIBXML2_WITH_MEM_DEBUG	42	READLINE_LIB_DEPENDS= libreadline.so:devel/readline
37	READLINE_LIB_DEPENDS= libreadline.so:devel/readline	43	READLINE_CONFIGURE_WITH= history \
38	READLINE_CMAKE_OFF= -DHAVE_LIBHISTORY=false -DHAVE_LIBREADLINE=false	44	readline
39	THREAD_ALLOC_CMAKE_BOOL=LIBXML2_WITH_THREAD_ALLOC	45	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc
40	TEST_CMAKE_BOOL= LIBXML2_WITH_TESTS
41	TEST_TEST_TARGET= test
42		46
43	post-patch:	47	post-patch:
44	.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1	48	.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
Lines 50-60 post-patch: Link Here
50		54
51	.if !defined(LIBXML2_SLAVE)	55	.if !defined(LIBXML2_SLAVE)
52	post-install:	56	post-install:
53	${RM} ${STAGEDIR}${DOCSDIR}/xmlcatalog.1	57	# Documentation should be in DOCSDIR
54	${RM} ${STAGEDIR}${DOCSDIR}/xmllint.1.bak	58	@${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \
55	${RM} ${STAGEDIR}${DOCSDIR}/xmllint.1	59	${STAGEDIR}${DOCSDIR}/devhelp
56	${RLN} ${STAGEDIR}${PREFIX}/lib/libxml2.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxml2.so.2	60	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
57	${INSTALL_DATA} ${WRKSRC}/libxml.m4 ${STAGEDIR}${PREFIX}/share/aclocal/libxml.m4	61	# Install remaining documentation that's not connected to autotools
		62	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
58	.endif	63	.endif
59		64
60	.include <bsd.port.mk>	65	.include <bsd.port.mk>

Removed Link Here

(-)a/textproc/libxml2/files/patch-CMakeLists.txt (-29 lines)
1	--- CMakeLists.txt.orig 2022-02-19 16:23:47 UTC
2	+++ CMakeLists.txt
3	@@ -691,7 +691,7 @@ if(LIBXML2_WITH_PYTHON)
4	configure_file(python/setup.py.in setup.py @ONLY)
5	endif()
6
7	-set(XML_INCLUDEDIR "-I\${includedir}/libxml2")
8	+set(XML_INCLUDEDIR "-I\${includedir}/libxml2 -I\${includedir}")
9	set(XML_LIBDIR "-L\${libdir}")
10	set(XML_LIBS "-lxml2")
11	set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_LIBS} ${ICONV_LIBS} ${ICU_LIBS} ${M_LIBS}")
12	@@ -699,14 +699,14 @@ set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_
13	file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
14	string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
15
16	-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
17	+set(prefix ${CMAKE_INSTALL_PREFIX})
18	set(exec_prefix "\${prefix}")
19	set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
20	set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
21	configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
22	-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
23	+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig COMPONENT development)
24
25	-set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
26	+set(prefix ${CMAKE_INSTALL_PREFIX})
27	configure_file(xml2-config.in xml2-config @ONLY)
28	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development)
29

Added Link Here

(-)b/textproc/libxml2/files/patch-Makefile.in (+47 lines)
1	--- Makefile.in.orig 2021-06-09 19:53:33 UTC
2	+++ Makefile.in
3	@@ -760,7 +760,7 @@ man_MANS = xml2-config.1 libxml.3
4	m4datadir = $(datadir)/aclocal
5	m4data_DATA = libxml.m4
6	runtest_SOURCES = runtest.c
7	-runtest_LDFLAGS =
8	+runtest_LDFLAGS = -pthread
9	runtest_DEPENDENCIES = $(DEPS)
10	runtest_LDADD = $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
11	testrecurse_SOURCES = testrecurse.c
12	@@ -808,7 +808,7 @@ testC14N_LDFLAGS =
13	testC14N_DEPENDENCIES = $(DEPS)
14	testC14N_LDADD = $(LDADDS)
15	testThreads_SOURCES = testThreads.c
16	-testThreads_LDFLAGS =
17	+testThreads_LDFLAGS = -pthread
18	testThreads_DEPENDENCIES = $(DEPS)
19	testThreads_LDADD = $(BASE_THREAD_LIBS) $(LDADDS)
20	testURI_SOURCES = testURI.c
21	@@ -1285,7 +1285,7 @@ am--depfiles: $(am__depfiles_remade)
22	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
23
24	.c.lo:
25	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
26	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
27	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo
28	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
29	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30	@@ -1774,7 +1774,7 @@ check-am: all-am
31	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
32	check: $(BUILT_SOURCES)
33	$(MAKE) $(AM_MAKEFLAGS) check-recursive
34	-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
35	+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
36	config.h
37	install-binPROGRAMS: install-libLTLIBRARIES
38
39	@@ -1911,7 +1911,7 @@ info: info-recursive
40
41	info-am:
42
43	-install-data-am: install-cmakeDATA install-data-local \
44	+install-data-am: install-cmakeDATA \
45	install-m4dataDATA install-man install-pkgconfigDATA
46
47	install-dvi: install-dvi-recursive

Lines 48-62 include/libxml2/libxml/xmlwriter.h Link Here

(-)b/textproc/libxml2/pkg-plist (-26 / +3 lines)
48	include/libxml2/libxml/xpath.h	48	include/libxml2/libxml/xpath.h
49	include/libxml2/libxml/xpathInternals.h	49	include/libxml2/libxml/xpathInternals.h
50	include/libxml2/libxml/xpointer.h	50	include/libxml2/libxml/xpointer.h
51	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config-version.cmake	51	lib/cmake/libxml2/libxml2-config.cmake
52	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config.cmake	52	lib/libxml2.a
53	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export-%%CMAKE_BUILD_TYPE%%.cmake
54	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export.cmake
55	lib/libxml2.so	53	lib/libxml2.so
56	lib/libxml2.so.2	54	lib/libxml2.so.2
57	lib/libxml2.so.%%LIBVERSION%%	55	lib/libxml2.so.%%LIBVERSION%%
58	lib/xml2Conf.sh	56	lib/xml2Conf.sh
59	libdata/pkgconfig/libxml-2.0.pc	57	libdata/pkgconfig/libxml-2.0.pc
		58	man/man1/xml2-config.1.gz
60	man/man1/xmlcatalog.1.gz	59	man/man1/xmlcatalog.1.gz
61	man/man1/xmllint.1.gz	60	man/man1/xmllint.1.gz
62	man/man3/libxml.3.gz	61	man/man3/libxml.3.gz
Lines 102-119 share/aclocal/libxml.m4 Link Here
102	%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-90x34.gif	101	%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-90x34.gif
103	%%PORTDOCS%%%%DOCSDIR%%/XMLinfo.html	102	%%PORTDOCS%%%%DOCSDIR%%/XMLinfo.html
104	%%PORTDOCS%%%%DOCSDIR%%/XSLT.html	103	%%PORTDOCS%%%%DOCSDIR%%/XSLT.html
105	%%PORTDOCS%%%%DOCSDIR%%/api.xsl
106	%%PORTDOCS%%%%DOCSDIR%%/apibuild.py
107	%%PORTDOCS%%%%DOCSDIR%%/architecture.html	104	%%PORTDOCS%%%%DOCSDIR%%/architecture.html
108	%%PORTDOCS%%%%DOCSDIR%%/bugs.html	105	%%PORTDOCS%%%%DOCSDIR%%/bugs.html
109	%%PORTDOCS%%%%DOCSDIR%%/catalog.gif
110	%%PORTDOCS%%%%DOCSDIR%%/catalog.html	106	%%PORTDOCS%%%%DOCSDIR%%/catalog.html
111	%%PORTDOCS%%%%DOCSDIR%%/checkapisym.xsl
112	%%PORTDOCS%%%%DOCSDIR%%/contribs.html	107	%%PORTDOCS%%%%DOCSDIR%%/contribs.html
113	%%PORTDOCS%%%%DOCSDIR%%/devhelp/devhelp2.xsl
114	%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html	108	%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
115	%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png	109	%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
116	%%PORTDOCS%%%%DOCSDIR%%/devhelp/html.xsl
117	%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html	110	%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
118	%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png	111	%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png
119	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-DOCBparser.html	112	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-DOCBparser.html
Lines 169-182 share/aclocal/libxml.m4 Link Here
169	%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png	162	%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
170	%%PORTDOCS%%%%DOCSDIR%%/docs.html	163	%%PORTDOCS%%%%DOCSDIR%%/docs.html
171	%%PORTDOCS%%%%DOCSDIR%%/downloads.html	164	%%PORTDOCS%%%%DOCSDIR%%/downloads.html
172	%%PORTDOCS%%%%DOCSDIR%%/elfgcchack.xsl
173	%%PORTDOCS%%%%DOCSDIR%%/encoding.html	165	%%PORTDOCS%%%%DOCSDIR%%/encoding.html
174	%%PORTDOCS%%%%DOCSDIR%%/entities.html	166	%%PORTDOCS%%%%DOCSDIR%%/entities.html
175	%%PORTDOCS%%%%DOCSDIR%%/example.html	167	%%PORTDOCS%%%%DOCSDIR%%/example.html
176	%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xml	168	%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xml
177	%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xsl	169	%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xsl
178	%%PORTDOCS%%%%DOCSDIR%%/examples/index.html	170	%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
179	%%PORTDOCS%%%%DOCSDIR%%/examples/index.py
180	%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c	171	%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
181	%%PORTDOCS%%%%DOCSDIR%%/examples/io1.res	172	%%PORTDOCS%%%%DOCSDIR%%/examples/io1.res
182	%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c	173	%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
Lines 263-289 share/aclocal/libxml.m4 Link Here
263	%%PORTDOCS%%%%DOCSDIR%%/html/right.png	254	%%PORTDOCS%%%%DOCSDIR%%/html/right.png
264	%%PORTDOCS%%%%DOCSDIR%%/html/up.png	255	%%PORTDOCS%%%%DOCSDIR%%/html/up.png
265	%%PORTDOCS%%%%DOCSDIR%%/index.html	256	%%PORTDOCS%%%%DOCSDIR%%/index.html
266	%%PORTDOCS%%%%DOCSDIR%%/index.py
267	%%PORTDOCS%%%%DOCSDIR%%/interface.html	257	%%PORTDOCS%%%%DOCSDIR%%/interface.html
268	%%PORTDOCS%%%%DOCSDIR%%/intro.html	258	%%PORTDOCS%%%%DOCSDIR%%/intro.html
269	%%PORTDOCS%%%%DOCSDIR%%/library.html	259	%%PORTDOCS%%%%DOCSDIR%%/library.html
270	%%PORTDOCS%%%%DOCSDIR%%/libxml.gif	260	%%PORTDOCS%%%%DOCSDIR%%/libxml.gif
271	%%PORTDOCS%%%%DOCSDIR%%/libxml2-api.xml
272	%%PORTDOCS%%%%DOCSDIR%%/libxml2.xsa
273	%%PORTDOCS%%%%DOCSDIR%%/namespaces.html	261	%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
274	%%PORTDOCS%%%%DOCSDIR%%/newapi.xsl
275	%%PORTDOCS%%%%DOCSDIR%%/news.html	262	%%PORTDOCS%%%%DOCSDIR%%/news.html
276	%%PORTDOCS%%%%DOCSDIR%%/news.xsl
277	%%PORTDOCS%%%%DOCSDIR%%/python.html	263	%%PORTDOCS%%%%DOCSDIR%%/python.html
278	%%PORTDOCS%%%%DOCSDIR%%/redhat.gif	264	%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
279	%%PORTDOCS%%%%DOCSDIR%%/search.php
280	%%PORTDOCS%%%%DOCSDIR%%/searches.html	265	%%PORTDOCS%%%%DOCSDIR%%/searches.html
281	%%PORTDOCS%%%%DOCSDIR%%/searches.xsl
282	%%PORTDOCS%%%%DOCSDIR%%/site.xsl
283	%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif	266	%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
284	%%PORTDOCS%%%%DOCSDIR%%/structure.gif	267	%%PORTDOCS%%%%DOCSDIR%%/structure.gif
285	%%PORTDOCS%%%%DOCSDIR%%/symbols.xml
286	%%PORTDOCS%%%%DOCSDIR%%/syms.xsl
287	%%PORTDOCS%%%%DOCSDIR%%/threads.html	268	%%PORTDOCS%%%%DOCSDIR%%/threads.html
288	%%PORTDOCS%%%%DOCSDIR%%/tree.html	269	%%PORTDOCS%%%%DOCSDIR%%/tree.html
289	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html	270	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html
Lines 337-350 share/aclocal/libxml.m4 Link Here
337	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html	318	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
338	%%PORTDOCS%%%%DOCSDIR%%/upgrade.html	319	%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
339	%%PORTDOCS%%%%DOCSDIR%%/w3c.png	320	%%PORTDOCS%%%%DOCSDIR%%/w3c.png
340	%%PORTDOCS%%%%DOCSDIR%%/wiki.xsl
341	%%PORTDOCS%%%%DOCSDIR%%/xml.html	321	%%PORTDOCS%%%%DOCSDIR%%/xml.html
342	%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.html	322	%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.html
343	%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.xml
344	%%PORTDOCS%%%%DOCSDIR%%/xmldtd.html	323	%%PORTDOCS%%%%DOCSDIR%%/xmldtd.html
345	%%PORTDOCS%%%%DOCSDIR%%/xmlio.html	324	%%PORTDOCS%%%%DOCSDIR%%/xmlio.html
346	%%PORTDOCS%%%%DOCSDIR%%/xmllint.html	325	%%PORTDOCS%%%%DOCSDIR%%/xmllint.html
347	%%PORTDOCS%%%%DOCSDIR%%/xmllint.xml
348	%%PORTDOCS%%%%DOCSDIR%%/xmlmem.html	326	%%PORTDOCS%%%%DOCSDIR%%/xmlmem.html
349	%%PORTDOCS%%%%DOCSDIR%%/xmlreader.html	327	%%PORTDOCS%%%%DOCSDIR%%/xmlreader.html
350	%%PORTDOCS%%%%DOCSDIR%%/xsa.xsl

Lines 1-45 Link Here

(-)b/textproc/py-libxml2/Makefile (-26 / +11 lines)
1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>	1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
2		2
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= textproc gnome python	4	CATEGORIES= textproc gnome python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6		6
7	COMMENT= Python interface for XML parser library for GNOME	7	COMMENT= Python interface for XML parser library for GNOME
8	MASTERDIR= ${.CURDIR}/../libxml2	8	MASTERDIR= ${.CURDIR}/../libxml2
9		9
10	USES+= gnome python shebangfix	10	USES+= gettext-runtime gnome python:3.6+ shebangfix
11	USE_GNOME= libxml2	11	USE_GNOME= libxml2
12	USE_PYTHON= flavors	12	USE_PYTHON= autoplist distutils
13	SHEBANG_FILES= .py doc/.py python/.py python/tests/.py	13	SHEBANG_FILES= .py doc/.py python/.py python/tests/.py
14		14
15	# Help CMake determine the correct version of Python if	15	OPTIONS_SLAVE=
16	# multiple versions are installed
17	CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD}
18
19	OPTIONS_SLAVE= ${OPTIONS_DEFINE:NTEST}
20		16
21	# Tell master port we're a slave port	17	# Tell master port we're a slave port
22	LIBXML2_SLAVE= python	18	LIBXML2_SLAVE= python
23	# Grab pkg-descr from slave port	19	# Grab pkg-descr from slave port
24	DESCR= ${.CURDIR}/pkg-descr	20	DESCR= ${.CURDIR}/pkg-descr
		21
		22	BUILD_WRKSRC= ${WRKSRC}/python
		23	INSTALL_WRKSRC= ${BUILD_WRKSRC}
		24
25	# Don't append pkg-plist from master port	25	# Don't append pkg-plist from master port
26	PLIST=	26	PLIST=
27	PLIST_FILES= ${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2.cpython-${PYTHON_SUFFIX}.opt-1.pyc \	27
28	${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2.cpython-${PYTHON_SUFFIX}.pyc \	28	DOCSDIR= ${PREFIX}/share/doc/py-libxml2
29	${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.opt-1.pyc \	29	EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2
30	${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.pyc \
31	${PYTHON_SITELIBDIR}/drv_libxml2.py \
32	${PYTHON_SITELIBDIR}/libxml2.py \
33	${PYTHON_SITELIBDIR}/libxml2mod.so \
34	${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
35
36	do-install:
37	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
38	${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
39	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
40	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
41	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
42	${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}
43	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
44		30
45	.include "${MASTERDIR}/Makefile"	31	.include "${MASTERDIR}/Makefile"
46	-