compat32_expat: Rename expat-32 to compat32_expat

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compat32_expat: Rename expat-32 to compat32_expat
From: Naveen Narayanan <zerous@nocebo.space>
Date: Tue, 23 Jul 2019 12:29:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Tue Jul 23 14:29:04 2019 +0200
Changeset:	290442646a228cd7d3a9f821aa88a8807f5e14aa

Added Files:
	compat32_expat/DESCR
	compat32_expat/Makefile
	compat32_expat/PLIST
	compat32_expat/buildlink3.mk
	compat32_expat/builtin.mk
	compat32_expat/distinfo
Removed Files:
	expat-32/DESCR
	expat-32/Makefile
	expat-32/PLIST
	expat-32/buildlink3.mk
	expat-32/builtin.mk
	expat-32/distinfo

Log Message:
compat32_expat: Rename expat-32 to compat32_expat

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

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

diffstat:
 compat32_expat/DESCR         |   5 ++
 compat32_expat/Makefile      |  35 +++++++++++++
 compat32_expat/PLIST         |  12 +++++
 compat32_expat/buildlink3.mk |  15 ++++++
 compat32_expat/builtin.mk    | 117 +++++++++++++++++++++++++++++++++++++++++++
 compat32_expat/distinfo      |   6 +++
 expat-32/DESCR               |   5 --
 expat-32/Makefile            |  35 -------------
 expat-32/PLIST               |  12 -----
 expat-32/buildlink3.mk       |  15 ------
 expat-32/builtin.mk          | 117 -------------------------------------------
 expat-32/distinfo            |   6 ---
 12 files changed, 190 insertions(+), 190 deletions(-)

diffs:
diff --git a/compat32_expat/DESCR b/compat32_expat/DESCR
new file mode 100644
index 0000000000..c09cd1069d
--- /dev/null
+++ b/compat32_expat/DESCR
@@ -0,0 +1,5 @@
+This is James Clark's expat XML parser library in C. It is a stream oriented
+parser that requires setting handlers to deal with the structure that the
+parser discovers in the document.
+
+This package is intended to crosscompile expat for i386 on amd64.
diff --git a/compat32_expat/Makefile b/compat32_expat/Makefile
new file mode 100644
index 0000000000..690cdc0282
--- /dev/null
+++ b/compat32_expat/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.38 2018/08/20 05:24:49 wiz Exp $
+
+DISTNAME=	expat-2.2.6
+CATEGORIES=	textproc
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
+EXTRACT_SUFX=	.tar.bz2
+ABI=		32
+PKGNAME=	compat${ABI}_${DISTNAME}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://expat.sourceforge.net/
+COMMENT=	XML parser library written in C
+LICENSE=	mit
+
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+CFLAGS+=		-m32
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
+
+# C++ is needed for tests only
+#USE_LANGUAGES=		c c++
+#TEST_TARGET=		check
+#USE_TOOLS+=		bash
+#REPLACE_BASH=		test-driver-wrapper.sh
+
+PKGCONFIG_OVERRIDE+=	expat.pc.in
+
+DOCDIR=	${PREFIX}/share/doc/expat
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/compat32_expat/PLIST b/compat32_expat/PLIST
new file mode 100644
index 0000000000..3bf62e1bdf
--- /dev/null
+++ b/compat32_expat/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+emul/netbsd32/bin/xmlwf
+emul/netbsd32/include/expat.h
+emul/netbsd32/include/expat_config.h
+emul/netbsd32/include/expat_external.h
+emul/netbsd32/lib/libexpat.la
+emul/netbsd32/lib/pkgconfig/expat.pc
+emul/netbsd32/man/man1/xmlwf.1
+emul/netbsd32/share/doc/expat/AUTHORS
+emul/netbsd32/share/doc/expat/changelog
+share/doc/expat/reference.html
+share/doc/expat/style.css
diff --git a/compat32_expat/buildlink3.mk b/compat32_expat/buildlink3.mk
new file mode 100644
index 0000000000..d734a4c3b9
--- /dev/null
+++ b/compat32_expat/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.21 2016/03/18 09:36:26 wiz Exp $
+
+BUILDLINK_TREE+=	compat32_expat
+
+.if !defined(COMPAT32_EXPAT_BUILDLINK3_MK)
+COMPAT32_EXPAT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.compat32_expat+=	compat32_expat>=1.95.7
+BUILDLINK_ABI_DEPENDS.compat32_expat+=	compat32_expat>=2.0.0nb1
+BUILDLINK_PKGSRCDIR.compat32_expat?=	../../wip/expat-32
+BUILDLINK_LIBDIRS.compat32_expat=	emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_expat=	emul/netbsd32/include
+.endif # COMPAT32_EXPAT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-compat32_expat
diff --git a/compat32_expat/builtin.mk b/compat32_expat/builtin.mk
new file mode 100644
index 0000000000..80aecf7814
--- /dev/null
+++ b/compat32_expat/builtin.mk
@@ -0,0 +1,117 @@
+# $NetBSD: builtin.mk,v 1.19 2015/02/04 23:44:34 tnn Exp $
+
+BUILTIN_PKG:=	expat
+
+BUILTIN_FIND_HEADERS_VAR:=	H_EXPAT
+BUILTIN_FIND_HEADERS.H_EXPAT=	expat.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
+.if !defined(IS_BUILTIN.expat)
+.  if empty(H_EXPAT:M__nonexistent__)
+IS_BUILTIN.expat=	yes
+.  else
+IS_BUILTIN.expat=	no
+.  endif
+.endif
+MAKEVARS+=	IS_BUILTIN.expat
+
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.expat) && \
+    !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \
+    empty(H_EXPAT:M__nonexistent__)
+BUILTIN_VERSION.expat!=							\
+	${AWK} '/\#define[ 	]*XML_MAJOR_VERSION/ { M = $$3 }	\
+		/\#define[ 	]*XML_MINOR_VERSION/ { m = "."$$3 }	\
+		/\#define[ 	]*XML_MICRO_VERSION/ { u = "."$$3 }	\
+		END { printf "%s%s%s\n", M, m, u }'			\
+		${H_EXPAT}
+BUILTIN_PKG.expat=	expat-${BUILTIN_VERSION.expat}
+.endif
+MAKEVARS+=	BUILTIN_PKG.expat
+
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+.if !defined(USE_BUILTIN.expat)
+.  if ${PREFER.expat} == "pkgsrc"
+USE_BUILTIN.expat=	no
+.  else
+USE_BUILTIN.expat=	${IS_BUILTIN.expat}
+.    if defined(BUILTIN_PKG.expat) && \
+        !empty(IS_BUILTIN.expat:M[yY][eE][sS])
+USE_BUILTIN.expat=	yes
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
+.        if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+USE_BUILTIN.expat!=							\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then	\
+		${ECHO} yes;						\
+	else								\
+		${ECHO} no;						\
+	fi
+.        endif
+.      endfor
+.    endif
+.  endif  # PREFER.expat
+.endif
+MAKEVARS+=	USE_BUILTIN.expat
+
+###
+### The section below only applies if we are not including this file
+### solely to determine whether a built-in implementation exists.
+###
+CHECK_BUILTIN.expat?=	no
+.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
+
+.  if !empty(USE_BUILTIN.expat:M[nN][oO])
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.4
+.  else
+.    if !empty(H_EXPAT:M${X11BASE}/*)
+.      include "../../mk/x11.builtin.mk"
+.    elif !empty(H_EXPAT:M/usr/*)
+BUILDLINK_PREFIX.expat=	/usr
+.    elif !empty(H_EXPAT:M/boot/common/*)
+BUILDLINK_PREFIX.expat=	/boot/common
+.    endif
+.  endif
+
+.endif	# CHECK_BUILTIN.expat
+
+# Fake pkg-config for builtin expat on NetBSD
+
+.if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+.  if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
+do-configure-pre-hook: override-expat-pkgconfig
+
+BLKDIR_PKGCFG=	${BUILDLINK_DIR}/lib/pkgconfig
+EXPAT_PKGCFGF=	expat.pc
+
+override-expat-pkgconfig: override-message-expat-pkgconfig
+override-message-expat-pkgconfig:
+	@${STEP_MSG} "Generating pkg-config file for builtin expat package."
+
+override-expat-pkgconfig:
+	${RUN}						\
+	${MKDIR} ${BLKDIR_PKGCFG};			\
+	{						\
+	${ECHO} "prefix=${BUILDLINK_PREFIX.expat}";		\
+	${ECHO} "exec_prefix=\$${prefix}";		\
+	${ECHO} "libdir=\$${exec_prefix}/lib";		\
+	${ECHO} "includedir=\$${prefix}/include";	\
+	${ECHO} "";					\
+	${ECHO} "Name: expat";				\
+	${ECHO} "Description: expat XML parser";	\
+	${ECHO} "Version: ${BUILTIN_VERSION.expat}";	\
+	${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -lexpat";	\
+	${ECHO} "Cflags: -I\$${includedir}";		\
+	} >> ${BLKDIR_PKGCFG}/${EXPAT_PKGCFGF};
+.  endif
+.endif
diff --git a/compat32_expat/distinfo b/compat32_expat/distinfo
new file mode 100644
index 0000000000..639d134b69
--- /dev/null
+++ b/compat32_expat/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.31 2018/08/20 05:24:49 wiz Exp $
+
+SHA1 (expat-2.2.6.tar.bz2) = c8947fc3119a797b55485f2f7bdaaeb49cc9df01
+RMD160 (expat-2.2.6.tar.bz2) = 22e3bc36be8459b0a2aa7957ea4ddea454244dfb
+SHA512 (expat-2.2.6.tar.bz2) = dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
+Size (expat-2.2.6.tar.bz2) = 513322 bytes
diff --git a/expat-32/DESCR b/expat-32/DESCR
deleted file mode 100644
index c09cd1069d..0000000000
--- a/expat-32/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is James Clark's expat XML parser library in C. It is a stream oriented
-parser that requires setting handlers to deal with the structure that the
-parser discovers in the document.
-
-This package is intended to crosscompile expat for i386 on amd64.
diff --git a/expat-32/Makefile b/expat-32/Makefile
deleted file mode 100644
index 690cdc0282..0000000000
--- a/expat-32/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.38 2018/08/20 05:24:49 wiz Exp $
-
-DISTNAME=	expat-2.2.6
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
-EXTRACT_SUFX=	.tar.bz2
-ABI=		32
-PKGNAME=	compat${ABI}_${DISTNAME}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://expat.sourceforge.net/
-COMMENT=	XML parser library written in C
-LICENSE=	mit
-
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-CFLAGS+=		-m32
-GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
-
-# C++ is needed for tests only
-#USE_LANGUAGES=		c c++
-#TEST_TARGET=		check
-#USE_TOOLS+=		bash
-#REPLACE_BASH=		test-driver-wrapper.sh
-
-PKGCONFIG_OVERRIDE+=	expat.pc.in
-
-DOCDIR=	${PREFIX}/share/doc/expat
-
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/expat-32/PLIST b/expat-32/PLIST
deleted file mode 100644
index 3bf62e1bdf..0000000000
--- a/expat-32/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD$
-emul/netbsd32/bin/xmlwf
-emul/netbsd32/include/expat.h
-emul/netbsd32/include/expat_config.h
-emul/netbsd32/include/expat_external.h
-emul/netbsd32/lib/libexpat.la
-emul/netbsd32/lib/pkgconfig/expat.pc
-emul/netbsd32/man/man1/xmlwf.1
-emul/netbsd32/share/doc/expat/AUTHORS
-emul/netbsd32/share/doc/expat/changelog
-share/doc/expat/reference.html
-share/doc/expat/style.css
diff --git a/expat-32/buildlink3.mk b/expat-32/buildlink3.mk
deleted file mode 100644
index d734a4c3b9..0000000000
--- a/expat-32/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.21 2016/03/18 09:36:26 wiz Exp $
-
-BUILDLINK_TREE+=	compat32_expat
-
-.if !defined(COMPAT32_EXPAT_BUILDLINK3_MK)
-COMPAT32_EXPAT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.compat32_expat+=	compat32_expat>=1.95.7
-BUILDLINK_ABI_DEPENDS.compat32_expat+=	compat32_expat>=2.0.0nb1
-BUILDLINK_PKGSRCDIR.compat32_expat?=	../../wip/expat-32
-BUILDLINK_LIBDIRS.compat32_expat=	emul/netbsd32/lib
-BUILDLINK_INCDIRS.compat32_expat=	emul/netbsd32/include
-.endif # COMPAT32_EXPAT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-compat32_expat
diff --git a/expat-32/builtin.mk b/expat-32/builtin.mk
deleted file mode 100644
index 80aecf7814..0000000000
--- a/expat-32/builtin.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# $NetBSD: builtin.mk,v 1.19 2015/02/04 23:44:34 tnn Exp $
-
-BUILTIN_PKG:=	expat
-
-BUILTIN_FIND_HEADERS_VAR:=	H_EXPAT
-BUILTIN_FIND_HEADERS.H_EXPAT=	expat.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if !defined(IS_BUILTIN.expat)
-.  if empty(H_EXPAT:M__nonexistent__)
-IS_BUILTIN.expat=	yes
-.  else
-IS_BUILTIN.expat=	no
-.  endif
-.endif
-MAKEVARS+=	IS_BUILTIN.expat
-
-###
-### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
-### a package name to represent the built-in package.
-###
-.if !defined(BUILTIN_PKG.expat) && \
-    !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \
-    empty(H_EXPAT:M__nonexistent__)
-BUILTIN_VERSION.expat!=							\
-	${AWK} '/\#define[ 	]*XML_MAJOR_VERSION/ { M = $$3 }	\
-		/\#define[ 	]*XML_MINOR_VERSION/ { m = "."$$3 }	\
-		/\#define[ 	]*XML_MICRO_VERSION/ { u = "."$$3 }	\
-		END { printf "%s%s%s\n", M, m, u }'			\
-		${H_EXPAT}
-BUILTIN_PKG.expat=	expat-${BUILTIN_VERSION.expat}
-.endif
-MAKEVARS+=	BUILTIN_PKG.expat
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.expat)
-.  if ${PREFER.expat} == "pkgsrc"
-USE_BUILTIN.expat=	no
-.  else
-USE_BUILTIN.expat=	${IS_BUILTIN.expat}
-.    if defined(BUILTIN_PKG.expat) && \
-        !empty(IS_BUILTIN.expat:M[yY][eE][sS])
-USE_BUILTIN.expat=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
-.        if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-USE_BUILTIN.expat!=							\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then	\
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.expat
-.endif
-MAKEVARS+=	USE_BUILTIN.expat
-
-###
-### The section below only applies if we are not including this file
-### solely to determine whether a built-in implementation exists.
-###
-CHECK_BUILTIN.expat?=	no
-.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
-
-.  if !empty(USE_BUILTIN.expat:M[nN][oO])
-BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.4
-.  else
-.    if !empty(H_EXPAT:M${X11BASE}/*)
-.      include "../../mk/x11.builtin.mk"
-.    elif !empty(H_EXPAT:M/usr/*)
-BUILDLINK_PREFIX.expat=	/usr
-.    elif !empty(H_EXPAT:M/boot/common/*)
-BUILDLINK_PREFIX.expat=	/boot/common
-.    endif
-.  endif
-
-.endif	# CHECK_BUILTIN.expat
-
-# Fake pkg-config for builtin expat on NetBSD
-
-.if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-.  if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
-do-configure-pre-hook: override-expat-pkgconfig
-
-BLKDIR_PKGCFG=	${BUILDLINK_DIR}/lib/pkgconfig
-EXPAT_PKGCFGF=	expat.pc
-
-override-expat-pkgconfig: override-message-expat-pkgconfig
-override-message-expat-pkgconfig:
-	@${STEP_MSG} "Generating pkg-config file for builtin expat package."
-
-override-expat-pkgconfig:
-	${RUN}						\
-	${MKDIR} ${BLKDIR_PKGCFG};			\
-	{						\
-	${ECHO} "prefix=${BUILDLINK_PREFIX.expat}";		\
-	${ECHO} "exec_prefix=\$${prefix}";		\
-	${ECHO} "libdir=\$${exec_prefix}/lib";		\
-	${ECHO} "includedir=\$${prefix}/include";	\
-	${ECHO} "";					\
-	${ECHO} "Name: expat";				\
-	${ECHO} "Description: expat XML parser";	\
-	${ECHO} "Version: ${BUILTIN_VERSION.expat}";	\
-	${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -lexpat";	\
-	${ECHO} "Cflags: -I\$${includedir}";		\
-	} >> ${BLKDIR_PKGCFG}/${EXPAT_PKGCFGF};
-.  endif
-.endif
diff --git a/expat-32/distinfo b/expat-32/distinfo
deleted file mode 100644
index 639d134b69..0000000000
--- a/expat-32/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.31 2018/08/20 05:24:49 wiz Exp $
-
-SHA1 (expat-2.2.6.tar.bz2) = c8947fc3119a797b55485f2f7bdaaeb49cc9df01
-RMD160 (expat-2.2.6.tar.bz2) = 22e3bc36be8459b0a2aa7957ea4ddea454244dfb
-SHA512 (expat-2.2.6.tar.bz2) = dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
-Size (expat-2.2.6.tar.bz2) = 513322 bytes
Prev by Date: compat32_expat: Remove cflag -m32 as ${ABI} is set
Next by Date: compat32_jpeg: Rename jpeg-32 to compat32_jpeg
Previous by Thread: compat32_expat: Remove cflag -m32 as ${ABI} is set
Next by Thread: compat32_jpeg: Rename jpeg-32 to compat32_jpeg
Indexes:
Home | Main Index | Thread Index | Old Index