pkgsrc-WIP-changes archive

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

giflib-32: Install package to ${PREFIX}/emul/netbsd32/



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Thu Jul 18 22:36:21 2019 +0200
Changeset:	12da03468809981a36cbaa4fbba0a4a2d37e2c1b

Modified Files:
	giflib-32/Makefile
	giflib-32/buildlink3.mk

Log Message:
giflib-32: Install package to ${PREFIX}/emul/netbsd32/

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

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

diffstat:
 giflib-32/Makefile      | 26 +++++++++-----------------
 giflib-32/buildlink3.mk |  4 +++-
 2 files changed, 12 insertions(+), 18 deletions(-)

diffs:
diff --git a/giflib-32/Makefile b/giflib-32/Makefile
index b6487e2a55..71ed8bb979 100644
--- a/giflib-32/Makefile
+++ b/giflib-32/Makefile
@@ -1,22 +1,14 @@
-# $NetBSD: Makefile,v 1.152 2019/01/09 19:09:02 adam Exp $
+# $NetBSD: Makefile,v 1.48 2013/08/31 18:41:33 adam Exp $
 
-ORIGINAL_PACKAGE=       ../../graphics/giflib
+.include "Makefile.common"
 
-ABI?=           	32
-ORIGINALPKG!=		make -C ${ORIGINAL_PACKAGE}	
-PKGNAME=		compat${ABI}_giflib-5.1.4
+COMMENT=	GIF image format library
 
-# XXX make a definition for netbsd archs.
-LIBABISUFFIX?=          /32
-CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
-CFLAGS+=                -m32
+CONFLICTS+=	libungif-[0-9]*
 
-remove-non-libraries:
-	echo "Removing non-compat library package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -o -type f -exec ${RM} {} +
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
+CFLAGS+=		-m32
+BUILD_DIRS=	lib
+INSTALL_DIRS=	lib
 
-post-install: remove-non-libraries
-
-GENERATE_PLIST= ${SED} -n '/^lib/ s;lib;lib${LIBABISUFFIX};p' ${ORIGINAL_PACKAGE}/PLIST;
-
-.include "${ORIGINAL_PACKAGE}/Makefile"
+.include "../../mk/bsd.pkg.mk"
diff --git a/giflib-32/buildlink3.mk b/giflib-32/buildlink3.mk
index 5bc61716d4..7b58b56a68 100644
--- a/giflib-32/buildlink3.mk
+++ b/giflib-32/buildlink3.mk
@@ -7,7 +7,9 @@ COMPAT32_GIFLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.compat32_giflib+=	compat32_giflib>=5.1.0
 BUILDLINK_PKGSRCDIR.compat32_giflib?=	../../wip/giflib-32
-BUILDLINK_LIBDIRS.compat32_giflib=	lib/32
+BUILDLINK_LIBDIRS.compat32_giflib=	emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_giflib=	emul/netbsd32/include
+
 .endif	# COMPAT32_GIFLIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-compat32_giflib


Home | Main Index | Thread Index | Old Index