pkgsrc-WIP-changes archive

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

jpeg-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:41:32 2019 +0200
Changeset:	94fdf0c8cf5078c552214c8e37325bdd14d67f5e

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

Log Message:
jpeg-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=94fdf0c8cf5078c552214c8e37325bdd14d67f5e

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

diffstat:
 jpeg-32/Makefile      | 35 ++++++++++++++++-------------------
 jpeg-32/buildlink3.mk |  3 ++-
 2 files changed, 18 insertions(+), 20 deletions(-)

diffs:
diff --git a/jpeg-32/Makefile b/jpeg-32/Makefile
index 6ebf002f08..4631b1bdb8 100644
--- a/jpeg-32/Makefile
+++ b/jpeg-32/Makefile
@@ -1,27 +1,25 @@
 # $NetBSD: Makefile,v 1.55 2019/03/10 11:22:43 spz Exp $
 
-DISTNAME=	jpegsrc.v9c
-ABI=		32
-PKGNAME=	compat${ABI}_${DISTNAME:S/src.v/-/}
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.ijg.org/files/
-DIST_SUBDIR=	jpeg-9c-v2
-PKGREVISION=	1
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.ijg.org/
-COMMENT=	IJG's jpeg compression utilities
+DISTNAME=		jpegsrc.v9c
+ABI=			32
+PKGNAME=		compat${ABI}_${DISTNAME:S/src.v/-/}
+CATEGORIES=		graphics
+MASTER_SITES=		http://www.ijg.org/files/
+DIST_SUBDIR=		jpeg-9c-v2
+PKGREVISION=		1
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		http://www.ijg.org/
+COMMENT=		IJG's jpeg compression utilities
 
 CONFLICTS=		libjpeg-turbo-[0-9]*
 
-#WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 WRKSRC=			${WRKDIR}/jpeg-9c
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-LIBABISUFFIX?=		/32
 CFLAGS+=		-m32
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
 CONFIGURE_ARGS+=	--disable-ld-version-script
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib${LIBABISUFFIX}
 
 INSTALLATION_DIRS=	bin include share/doc/jpeg
 
@@ -32,10 +30,9 @@ TEST_TARGET=		test
 post-extract:
 	${CP} ${FILESDIR}/jpegexiforient.c ${WRKSRC}
 
-remove-non-libraries:
-	echo "Removing non-compat library package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -o -type f -exec ${RM} {} +
-
-post-install: remove-non-libraries
+post-install:
+	# ${INSTALL_SCRIPT} ${FILESDIR}/exifautotran ${DESTDIR}${PREFIX}/bin
+	# ${INSTALL_DATA} ${WRKSRC}/jpegint.h ${DESTDIR}${PREFIX}/include
+	# ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/jpeg
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/jpeg-32/buildlink3.mk b/jpeg-32/buildlink3.mk
index 70f261ada1..62f98e5d32 100644
--- a/jpeg-32/buildlink3.mk
+++ b/jpeg-32/buildlink3.mk
@@ -8,7 +8,8 @@ COMPAT32_JPEG_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.compat32_jpeg+=	compat32_jpeg>=8nb1
 BUILDLINK_ABI_DEPENDS.compat32_jpeg+=	compat32_jpeg>=9
 BUILDLINK_PKGSRCDIR.compat32_jpeg?=	../../wip/jpeg-32
-BUILDLINK_LIBDIRS.compat32_jpeg=	lib/32
+BUILDLINK_LIBDIRS.compat32_jpeg=	/emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_jpeg=	/emul/netbsd32/include
 .endif # COMPAT32_JPEG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-compat32_jpeg


Home | Main Index | Thread Index | Old Index