pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libxml2-32: Update Makefile to work with original package



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Sun Jun 30 17:52:31 2019 +0200
Changeset:	57fe8cf4a6cf03fa66183c68024d2e29136aecdd

Modified Files:
	libxml2-32/Makefile

Log Message:
libxml2-32: Update Makefile to work with original package

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=57fe8cf4a6cf03fa66183c68024d2e29136aecdd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libxml2-32/Makefile | 55 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 9 deletions(-)

diffs:
diff --git a/libxml2-32/Makefile b/libxml2-32/Makefile
index a5fa42db2f..07b7960bcd 100644
--- a/libxml2-32/Makefile
+++ b/libxml2-32/Makefile
@@ -1,15 +1,48 @@
 # $NetBSD: Makefile,v 1.152 2019/01/09 19:09:02 adam Exp $
 
-ORIGINAL_PACKAGE=       ../../textproc/libxml2
+.include "../../wip/libxml2-32/Makefile.common"
 
-ABI?=           	32
-ORIGINAL_PKGNAME!=	make -V PKGNAME -C ${ORIGINAL_PACKAGE}
-PKGNAME=		compat${ABI}_${ORIGINAL_PKGNAME}
+ABI?=		32
+PKGNAME?=	compat${ABI}_${DISTNAME}
+COMMENT=	XML parser library from the GNOME project
+LICENSE=	modified-bsd
 
-# XXX make a definition for netbsd archs.
-LIBABISUFFIX?=          /32
+USE_FEATURES=		glob
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+LIBABISUFFIX?=		/32
+
+CONFIGURE_ARGS+=	--with-html-subdir=libxml2
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+=	--with-lzma=${BUILDLINK_PREFIX.xz}
+CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
 CFLAGS+=                -m32
+PKGCONFIG_OVERRIDE=	libxml-2.0.pc.in
+
+USE_LANGUAGES+=		c99
+
+.include "options.mk"
+
+# allow thread-awareness, but make sure the library is not
+# linked against libpthread
+#CONFIGURE_ARGS+=	--without-threads
+
+MAKE_ENV+=	PAX=${PAX:Q}
+
+TEST_TARGET=	check
+
+SUBST_CLASSES+=		cat
+SUBST_STAGE.cat=	pre-configure
+SUBST_FILES.cat=	catalog.c xmlcatalog.c
+SUBST_SED.cat=		-e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
+SUBST_SED.cat+=		-e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
+
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror=format=2
+
+LDFLAGS.SCO_SV+=	-lm
 
 remove-non-libraries:
 	echo "Removing non-compat library package content"
@@ -17,6 +50,10 @@ remove-non-libraries:
 
 post-install: remove-non-libraries
 
-GENERATE_PLIST= ${SED} -n '/^lib/ s;lib;lib${LIBABISUFFIX};p' ${ORIGINAL_PACKAGE}/PLIST;
-
-.include "${ORIGINAL_PACKAGE}/Makefile"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index