pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
freetype2-32: Install package to ${PREFIX}/emul/netbsd32
Module Name: pkgsrc-wip
Committed By: Naveen Narayanan <zerous@nocebo.space>
Pushed By: zerous
Date: Fri Jul 19 11:22:17 2019 +0200
Changeset: bd727a5ded94dac02a5108794649f4e7d620f233
Modified Files:
freetype2-32/Makefile
freetype2-32/buildlink3.mk
Log Message:
freetype2-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=bd727a5ded94dac02a5108794649f4e7d620f233
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
freetype2-32/Makefile | 5 ++---
freetype2-32/buildlink3.mk | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diffs:
diff --git a/freetype2-32/Makefile b/freetype2-32/Makefile
index aeaa6670e6..a18aff60c7 100644
--- a/freetype2-32/Makefile
+++ b/freetype2-32/Makefile
@@ -14,14 +14,13 @@ COMMENT= Font rendering engine and library API
LICENSE= gnu-gpl-v2
USE_LIBTOOL= yes
-LIBABISUFFIX?= /32
USE_TOOLS+= grep gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_DIRS= builds/unix
CFLAGS+= -m32
BUILD_DIRS= .
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib${LIBABISUFFIX}
+GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
+CONFIGURE_ARGS+= --libdir=${PREFIX}/emul/netbsd32/lib/freetype2
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --with-harfbuzz=no
CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q}
diff --git a/freetype2-32/buildlink3.mk b/freetype2-32/buildlink3.mk
index 6ea65607ed..92bb5b4f52 100644
--- a/freetype2-32/buildlink3.mk
+++ b/freetype2-32/buildlink3.mk
@@ -8,10 +8,10 @@ COMPAT32_FREETYPE2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.compat32_freetype2+= compat32_freetype2>=2.4.5
BUILDLINK_ABI_DEPENDS.compat32_freetype2+= compat32_freetype2>=2.4.11
BUILDLINK_PKGSRCDIR.compat32_freetype2?= ../../wip/freetype2-32
-BUILDLINK_INCDIRS.compat32_freetype2?= include/freetype2
-BUILDLINK_LIBDIRS.compat32_freetype2?= lib/32
+BUILDLINK_INCDIRS.compat32_freetype2?= emul/netbsd32/include
+BUILDLINK_LIBDIRS.compat32_freetype2?= emul/netbsd32/lib/freetype2
-BUILDLINK_FILES.compat32_freetype2+= bin/freetype-config
+BUILDLINK_FILES.compat32_freetype2+= emul/netbsd32/bin/freetype-config
FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
Home |
Main Index |
Thread Index |
Old Index