pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compat32_freetype2: Rename freetype2-32 to compat32_freetype2
- To: pkgsrc-wip-changes%NetBSD.org@localhost
- Subject: compat32_freetype2: Rename freetype2-32 to compat32_freetype2
- From: Naveen Narayanan <zerous@nocebo.space>
- Date: Tue, 23 Jul 2019 12:53:54 +0000
Module Name: pkgsrc-wip
Committed By: Naveen Narayanan <zerous@nocebo.space>
Pushed By: zerous
Date: Tue Jul 23 14:53:54 2019 +0200
Changeset: 7d7957e97218196481a0ea7e27ff3a80f34688a5
Added Files:
compat32_freetype2/DESCR
compat32_freetype2/Makefile
compat32_freetype2/PLIST
compat32_freetype2/buildlink3.mk
compat32_freetype2/builtin.mk
compat32_freetype2/distinfo
compat32_freetype2/options.mk
compat32_freetype2/patches/patch-builds_unix_freetype-config.in
compat32_freetype2/patches/patch-builds_unix_unix-cc.in
Removed Files:
freetype2-32/DESCR
freetype2-32/Makefile
freetype2-32/PLIST
freetype2-32/buildlink3.mk
freetype2-32/builtin.mk
freetype2-32/distinfo
freetype2-32/options.mk
freetype2-32/patches/patch-builds_unix_freetype-config.in
freetype2-32/patches/patch-builds_unix_unix-cc.in
Log Message:
compat32_freetype2: Rename freetype2-32 to compat32_freetype2
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7d7957e97218196481a0ea7e27ff3a80f34688a5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
compat32_freetype2/DESCR | 11 +++
compat32_freetype2/Makefile | 70 ++++++++++++++++
compat32_freetype2/PLIST | 56 +++++++++++++
compat32_freetype2/buildlink3.mk | 37 ++++++++
compat32_freetype2/builtin.mk | 98 ++++++++++++++++++++++
compat32_freetype2/distinfo | 8 ++
compat32_freetype2/options.mk | 13 +++
.../patches/patch-builds_unix_freetype-config.in | 41 +++++++++
.../patches/patch-builds_unix_unix-cc.in | 34 ++++++++
freetype2-32/DESCR | 11 ---
freetype2-32/Makefile | 70 ----------------
freetype2-32/PLIST | 56 -------------
freetype2-32/buildlink3.mk | 37 --------
freetype2-32/builtin.mk | 98 ----------------------
freetype2-32/distinfo | 8 --
freetype2-32/options.mk | 13 ---
.../patches/patch-builds_unix_freetype-config.in | 41 ---------
freetype2-32/patches/patch-builds_unix_unix-cc.in | 34 --------
18 files changed, 368 insertions(+), 368 deletions(-)
diffs:
diff --git a/compat32_freetype2/DESCR b/compat32_freetype2/DESCR
new file mode 100644
index 0000000000..4d14d04c85
--- /dev/null
+++ b/compat32_freetype2/DESCR
@@ -0,0 +1,11 @@
+FreeType is a portable, high-quality software solution for digital
+typography. FreeType 1.3.1 was the last release of the FreeType 1
+engine, as the project is now switching to a new version dubbed FreeType
+2. It has, among other things, several advantages over FreeType 1:
+
+ * A universal and simple API to manage font files
+ * Support for several font formats through loadable drivers
+ * Even more portable
+ * An improved anti-aliasing algorithm
+
+Note: This package is intended to crosscompile freetype2 for i386
diff --git a/compat32_freetype2/Makefile b/compat32_freetype2/Makefile
new file mode 100644
index 0000000000..a18aff60c7
--- /dev/null
+++ b/compat32_freetype2/Makefile
@@ -0,0 +1,70 @@
+# $NetBSD: Makefile,v 1.117 2019/04/02 07:17:17 adam Exp $
+
+DISTNAME= freetype-2.10.0
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/}
+MASTER_SITES+= http://download.savannah.gnu.org/releases/freetype/
+EXTRACT_SUFX= .tar.bz2
+ABI= 32
+PKGNAME= compat${ABI}_${DISTNAME:S/-/2-/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.freetype.org/
+COMMENT= Font rendering engine and library API
+LICENSE= gnu-gpl-v2
+
+USE_LIBTOOL= yes
+USE_TOOLS+= grep gmake pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_DIRS= builds/unix
+CFLAGS+= -m32
+BUILD_DIRS= .
+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}
+
+# Remove this when all dependent packages have switched to pkg-config
+CONFIGURE_ARGS+= --enable-freetype-config
+
+.if exists(/System/Library/Frameworks/Carbon.framework)
+LDFLAGS+= -framework Carbon
+.endif
+
+PKGCONFIG_OVERRIDE= builds/unix/freetype2.in
+SUBST_CLASSES+= ftc
+SUBST_FILES.ftc+= builds/unix/freetype-config.in
+SUBST_SED.ftc+= -e "s!echo -L\([^ ]*\)!echo ${COMPILER_RPATH_FLAG}\\1 -L\\1!"
+SUBST_STAGE.ftc+= pre-configure
+SUBST_MESSAGE.ftc+= Fixing rpath in freetype-config script.
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+
+.include "options.mk"
+
+# source code breaks strict aliasing in gcc>=2.95
+.if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*)
+CFLAGS+= -fno-strict-aliasing
+.endif
+
+# tell configure not to use unix-specific version of ftsystem.c on OpenBSD
+CONFIGURE_ENV.OpenBSD+= ac_cv_func_mmap_fixed_mapped=no
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+CONFIGURE_ENV+= CC_BUILD=${NATIVE_CC:Q}
+.endif
+
+post-configure:
+ cd ${WRKSRC} && ${LN} -f -s builds/unix/unix.mk config.mk
+.if ${OPSYS} == "IRIX"
+ ${MKDIR} ${WRKSRC}/.libs
+.endif
+
+.include "../../archivers/bzip2/buildlink3.mk"
+# Avoid creating a fake zlib.pc, because if it does
+# we will add a Requires for it to our .pc file
+CHECK_BUILTIN.zlib:=yes
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/compat32_freetype2/PLIST b/compat32_freetype2/PLIST
new file mode 100644
index 0000000000..80ab826db3
--- /dev/null
+++ b/compat32_freetype2/PLIST
@@ -0,0 +1,56 @@
+@comment $NetBSD$
+emul/netbsd32/bin/freetype-config
+emul/netbsd32/include/freetype2/freetype/config/ftconfig.h
+emul/netbsd32/include/freetype2/freetype/config/ftheader.h
+emul/netbsd32/include/freetype2/freetype/config/ftmodule.h
+emul/netbsd32/include/freetype2/freetype/config/ftoption.h
+emul/netbsd32/include/freetype2/freetype/config/ftstdlib.h
+emul/netbsd32/include/freetype2/freetype/freetype.h
+emul/netbsd32/include/freetype2/freetype/ftadvanc.h
+emul/netbsd32/include/freetype2/freetype/ftbbox.h
+emul/netbsd32/include/freetype2/freetype/ftbdf.h
+emul/netbsd32/include/freetype2/freetype/ftbitmap.h
+emul/netbsd32/include/freetype2/freetype/ftbzip2.h
+emul/netbsd32/include/freetype2/freetype/ftcache.h
+emul/netbsd32/include/freetype2/freetype/ftchapters.h
+emul/netbsd32/include/freetype2/freetype/ftcid.h
+emul/netbsd32/include/freetype2/freetype/ftcolor.h
+emul/netbsd32/include/freetype2/freetype/ftdriver.h
+emul/netbsd32/include/freetype2/freetype/fterrdef.h
+emul/netbsd32/include/freetype2/freetype/fterrors.h
+emul/netbsd32/include/freetype2/freetype/ftfntfmt.h
+emul/netbsd32/include/freetype2/freetype/ftgasp.h
+emul/netbsd32/include/freetype2/freetype/ftglyph.h
+emul/netbsd32/include/freetype2/freetype/ftgxval.h
+emul/netbsd32/include/freetype2/freetype/ftgzip.h
+emul/netbsd32/include/freetype2/freetype/ftimage.h
+emul/netbsd32/include/freetype2/freetype/ftincrem.h
+emul/netbsd32/include/freetype2/freetype/ftlcdfil.h
+emul/netbsd32/include/freetype2/freetype/ftlist.h
+emul/netbsd32/include/freetype2/freetype/ftlzw.h
+emul/netbsd32/include/freetype2/freetype/ftmac.h
+emul/netbsd32/include/freetype2/freetype/ftmm.h
+emul/netbsd32/include/freetype2/freetype/ftmodapi.h
+emul/netbsd32/include/freetype2/freetype/ftmoderr.h
+emul/netbsd32/include/freetype2/freetype/ftotval.h
+emul/netbsd32/include/freetype2/freetype/ftoutln.h
+emul/netbsd32/include/freetype2/freetype/ftparams.h
+emul/netbsd32/include/freetype2/freetype/ftpfr.h
+emul/netbsd32/include/freetype2/freetype/ftrender.h
+emul/netbsd32/include/freetype2/freetype/ftsizes.h
+emul/netbsd32/include/freetype2/freetype/ftsnames.h
+emul/netbsd32/include/freetype2/freetype/ftstroke.h
+emul/netbsd32/include/freetype2/freetype/ftsynth.h
+emul/netbsd32/include/freetype2/freetype/ftsystem.h
+emul/netbsd32/include/freetype2/freetype/fttrigon.h
+emul/netbsd32/include/freetype2/freetype/fttypes.h
+emul/netbsd32/include/freetype2/freetype/ftwinfnt.h
+emul/netbsd32/include/freetype2/freetype/t1tables.h
+emul/netbsd32/include/freetype2/freetype/ttnameid.h
+emul/netbsd32/include/freetype2/freetype/tttables.h
+emul/netbsd32/include/freetype2/freetype/tttags.h
+emul/netbsd32/include/freetype2/ft2build.h
+emul/netbsd32/lib/freetype2/libfreetype.la
+emul/netbsd32/lib/freetype2/pkgconfig/freetype2.pc
+emul/netbsd32/man/man1/freetype-config.1
+emul/netbsd32/share/aclocal/freetype2.m4
diff --git a/compat32_freetype2/buildlink3.mk b/compat32_freetype2/buildlink3.mk
new file mode 100644
index 0000000000..b9364b9cc9
--- /dev/null
+++ b/compat32_freetype2/buildlink3.mk
@@ -0,0 +1,37 @@
+# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:14 rillig Exp $
+
+BUILDLINK_TREE+= compat32_freetype2
+
+.if !defined(COMPAT32_FREETYPE2_BUILDLINK3_MK)
+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?= emul/netbsd32/include
+BUILDLINK_LIBDIRS.compat32_freetype2?= emul/netbsd32/lib/freetype2
+
+BUILDLINK_FILES.compat32_freetype2+= emul/netbsd32/bin/freetype-config
+
+FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/emul/netbsd32/bin/freetype-config
+CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+pkgbase := compat32_freetype2
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.compat32_freetype2:Mpng)
+CHECK_BUILTIN.compat32_freetype2:= yes
+.include "../../wip/freetype2-32/builtin.mk"
+CHECK_BUILTIN.compat32_freetype2:= no
+
+. if empty(USE_BUILTIN.compat32_freetype2:M[yY][eE][sS])
+. include "../../wip/png-32/buildlink3.mk"
+. endif
+.endif
+
+.endif # COMPAT32_FREETYPE2_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -compat32_freetype2
diff --git a/compat32_freetype2/builtin.mk b/compat32_freetype2/builtin.mk
new file mode 100644
index 0000000000..4b9ce9e6da
--- /dev/null
+++ b/compat32_freetype2/builtin.mk
@@ -0,0 +1,98 @@
+# $NetBSD: builtin.mk,v 1.18 2018/05/04 08:40:11 adam Exp $
+
+BUILTIN_PKG:= freetype2
+
+BUILTIN_FIND_FILES_VAR:= H_FREETYPE2 H_FREETYPE2_NEW
+BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.h
+BUILTIN_FIND_FILES.H_FREETYPE2_NEW= ${X11BASE}/include/freetype2/freetype.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.freetype2)
+. if empty(H_FREETYPE2:M__nonexistent__)
+IS_BUILTIN.freetype2= yes
+. elif empty(H_FREETYPE2_NEW:M__nonexistent__)
+IS_BUILTIN.freetype2= yes
+H_FREETYPE2:= ${H_FREETYPE2_NEW}
+. else
+IS_BUILTIN.freetype2= no
+. endif
+.endif
+MAKEVARS+= IS_BUILTIN.freetype2
+
+###
+### 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.freetype2) && \
+ !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) && \
+ empty(H_FREETYPE2:M__nonexistent__)
+BUILTIN_VERSION.freetype2!= \
+ ${AWK} 'BEGIN { p = ".0" } \
+ /\#define[ ]*FREETYPE_MAJOR/ { M = $$3 } \
+ /\#define[ ]*FREETYPE_MINOR/ { m = "."$$3 } \
+ /\#define[ ]*FREETYPE_PATCH/ { p = "."$$3 } \
+ END { printf "%s%s%s\n", M, m, p }' \
+ ${H_FREETYPE2}
+BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2}
+.endif
+MAKEVARS+= BUILTIN_PKG.freetype2
+
+###
+### 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.freetype2)
+. if ${PREFER.freetype2} == "pkgsrc"
+USE_BUILTIN.freetype2= no
+. else
+USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2}
+. if defined(BUILTIN_PKG.freetype2) && \
+ !empty(IS_BUILTIN.freetype2:M[yY][eE][sS])
+USE_BUILTIN.freetype2= yes
+. for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
+. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
+USE_BUILTIN.freetype2!= \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2}; then \
+ ${ECHO} yes; \
+ else \
+ ${ECHO} no; \
+ fi
+. endif
+. endfor
+. endif
+. endif # PREFER.freetype2
+.endif
+MAKEVARS+= USE_BUILTIN.freetype2
+
+###
+### The section below only applies if we are not including this file
+### solely to determine whether a built-in implementation exists.
+###
+
+.include "../../mk/x11.builtin.mk"
+
+CHECK_BUILTIN.freetype2?= no
+.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
+
+. if !empty(USE_BUILTIN.freetype2:M[nN][oO])
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
+. else
+. if !empty(MACHINE_PLATFORM:MNetBSD-[67].*-*) && \
+ (("${BUILTIN_VERSION.freetype2}" == "2.4.5") || \
+ ("${BUILTIN_VERSION.freetype2}" == "2.5.3"))
+_FT2_VER_MAP.2.5.3=17.2.11
+_FT2_VER_MAP.2.4.5=13.0.7
+SUBST_CLASSES+= fx-ft2-pc-version
+SUBST_STAGE.fx-ft2-pc-version= post-wrapper
+SUBST_MESSAGE.fx-ft2-pc-version=Fixes wrong module version in freetype2.pc
+SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc
+SUBST_SED.fx-ft2-pc-version= -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|'
+. endif
+. endif
+
+.endif # CHECK_BUILTIN.freetype2
diff --git a/compat32_freetype2/distinfo b/compat32_freetype2/distinfo
new file mode 100644
index 0000000000..d85f11b0db
--- /dev/null
+++ b/compat32_freetype2/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.66 2019/04/02 07:17:17 adam Exp $
+
+SHA1 (freetype-2.10.0.tar.bz2) = f6abf03e0e3189a0de883981c57d3861b5d314f5
+RMD160 (freetype-2.10.0.tar.bz2) = 502cb1d6c0e778fdbc2498d086ab3c1120dd3d5b
+SHA512 (freetype-2.10.0.tar.bz2) = dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
+Size (freetype-2.10.0.tar.bz2) = 2743740 bytes
+SHA1 (patch-builds_unix_freetype-config.in) = 60217b884a0f50c90f89529eaf909ded2693e3be
+SHA1 (patch-builds_unix_unix-cc.in) = 39e5a3defda9e330b36f56e47a9a27c39eacddae
diff --git a/compat32_freetype2/options.mk b/compat32_freetype2/options.mk
new file mode 100644
index 0000000000..8fd5b75a5b
--- /dev/null
+++ b/compat32_freetype2/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.4 2016/09/12 18:06:44 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
+PKG_SUPPORTED_OPTIONS= png
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpng)
+CONFIGURE_ARGS+= --with-png=yes
+.include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --with-png=no
+.endif
diff --git a/compat32_freetype2/patches/patch-builds_unix_freetype-config.in b/compat32_freetype2/patches/patch-builds_unix_freetype-config.in
new file mode 100644
index 0000000000..45548c45f4
--- /dev/null
+++ b/compat32_freetype2/patches/patch-builds_unix_freetype-config.in
@@ -0,0 +1,41 @@
+$NetBSD: patch-builds_unix_freetype-config.in,v 1.1 2017/09/18 16:54:06 adam Exp $
+
+Do not substitute %PKG_CONFIG% as it ends with temporary DESTDIR.
+
+--- builds/unix/freetype-config.in.orig 2017-09-18 15:52:06.000000000 +0000
++++ builds/unix/freetype-config.in
+@@ -14,7 +14,7 @@ export LC_ALL
+
+
+ # if `pkg-config' is available, use values from `freetype2.pc'
+-%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
++pkg-config --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
+ if test $? -eq 0 ; then
+ # note that option `--variable' is not affected by the
+ # PKG_CONFIG_SYSROOT_DIR environment variable
+@@ -23,17 +23,17 @@ if test $? -eq 0 ; then
+ export PKG_CONFIG_SYSROOT_DIR
+ fi
+
+- prefix=`%PKG_CONFIG% --variable prefix freetype2`
+- exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
++ prefix=`pkg-config --variable prefix freetype2`
++ exec_prefix=`pkg-config --variable exec_prefix freetype2`
+
+- includedir=`%PKG_CONFIG% --variable includedir freetype2`
+- libdir=`%PKG_CONFIG% --variable libdir freetype2`
++ includedir=`pkg-config --variable includedir freetype2`
++ libdir=`pkg-config --variable libdir freetype2`
+
+- version=`%PKG_CONFIG% --modversion freetype2`
++ version=`pkg-config --modversion freetype2`
+
+- cflags=`%PKG_CONFIG% --cflags freetype2`
+- dynamic_libs=`%PKG_CONFIG% --libs freetype2`
+- static_libs=`%PKG_CONFIG% --static --libs freetype2`
++ cflags=`pkg-config --cflags freetype2`
++ dynamic_libs=`pkg-config --libs freetype2`
++ static_libs=`pkg-config --static --libs freetype2`
+ else
+ prefix="%prefix%"
+ exec_prefix="%exec_prefix%"
diff --git a/compat32_freetype2/patches/patch-builds_unix_unix-cc.in b/compat32_freetype2/patches/patch-builds_unix_unix-cc.in
new file mode 100644
index 0000000000..0c7ba448fe
--- /dev/null
+++ b/compat32_freetype2/patches/patch-builds_unix_unix-cc.in
@@ -0,0 +1,34 @@
+$NetBSD: patch-builds_unix_unix-cc.in,v 1.2 2018/05/04 08:40:11 adam Exp $
+
+Provide tag to libtool.
+Use CFLAGS when compiling executables.
+
+--- builds/unix/unix-cc.in.orig 2018-04-22 09:41:36.000000000 +0000
++++ builds/unix/unix-cc.in
+@@ -88,7 +88,7 @@ ANSIFLAGS := @XX_ANSIFLAGS@
+ # C compiler to use -- we use libtool!
+ #
+ CCraw := $(CC)
+-CC := $(LIBTOOL) --mode=compile $(CCraw)
++CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
+
+ # Resource compiler to use on Cygwin/MinGW, usually windres.
+ #
+@@ -108,14 +108,14 @@ LIB_CLOCK_GETTIME := @LIB_CLOCK_GETTIME@
+ CCraw_build := @CC_BUILD@ # native CC of building system
+ E_BUILD := @EXEEXT_BUILD@ # extension for executable on building system
+ EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
+-CCexe := $(CCraw_build) # used to compile `apinames' only
++CCexe := $(CCraw_build) @CFLAGS@ # used to compile `apinames' only
+
+
+ # Library linking
+ #
+-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
++LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
+ -rpath $(libdir) -version-info $(version_info) \
+ $(LDFLAGS) -no-undefined \
+- -export-symbols $(EXPORTS_LIST)
++ # -export-symbols $(EXPORTS_LIST)
+
+ # EOF
diff --git a/freetype2-32/DESCR b/freetype2-32/DESCR
deleted file mode 100644
index 4d14d04c85..0000000000
--- a/freetype2-32/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-FreeType is a portable, high-quality software solution for digital
-typography. FreeType 1.3.1 was the last release of the FreeType 1
-engine, as the project is now switching to a new version dubbed FreeType
-2. It has, among other things, several advantages over FreeType 1:
-
- * A universal and simple API to manage font files
- * Support for several font formats through loadable drivers
- * Even more portable
- * An improved anti-aliasing algorithm
-
-Note: This package is intended to crosscompile freetype2 for i386
diff --git a/freetype2-32/Makefile b/freetype2-32/Makefile
deleted file mode 100644
index a18aff60c7..0000000000
--- a/freetype2-32/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# $NetBSD: Makefile,v 1.117 2019/04/02 07:17:17 adam Exp $
-
-DISTNAME= freetype-2.10.0
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/}
-MASTER_SITES+= http://download.savannah.gnu.org/releases/freetype/
-EXTRACT_SUFX= .tar.bz2
-ABI= 32
-PKGNAME= compat${ABI}_${DISTNAME:S/-/2-/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.freetype.org/
-COMMENT= Font rendering engine and library API
-LICENSE= gnu-gpl-v2
-
-USE_LIBTOOL= yes
-USE_TOOLS+= grep gmake pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_DIRS= builds/unix
-CFLAGS+= -m32
-BUILD_DIRS= .
-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}
-
-# Remove this when all dependent packages have switched to pkg-config
-CONFIGURE_ARGS+= --enable-freetype-config
-
-.if exists(/System/Library/Frameworks/Carbon.framework)
-LDFLAGS+= -framework Carbon
-.endif
-
-PKGCONFIG_OVERRIDE= builds/unix/freetype2.in
-SUBST_CLASSES+= ftc
-SUBST_FILES.ftc+= builds/unix/freetype-config.in
-SUBST_SED.ftc+= -e "s!echo -L\([^ ]*\)!echo ${COMPILER_RPATH_FLAG}\\1 -L\\1!"
-SUBST_STAGE.ftc+= pre-configure
-SUBST_MESSAGE.ftc+= Fixing rpath in freetype-config script.
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-
-.include "options.mk"
-
-# source code breaks strict aliasing in gcc>=2.95
-.if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*)
-CFLAGS+= -fno-strict-aliasing
-.endif
-
-# tell configure not to use unix-specific version of ftsystem.c on OpenBSD
-CONFIGURE_ENV.OpenBSD+= ac_cv_func_mmap_fixed_mapped=no
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-CONFIGURE_ENV+= CC_BUILD=${NATIVE_CC:Q}
-.endif
-
-post-configure:
- cd ${WRKSRC} && ${LN} -f -s builds/unix/unix.mk config.mk
-.if ${OPSYS} == "IRIX"
- ${MKDIR} ${WRKSRC}/.libs
-.endif
-
-.include "../../archivers/bzip2/buildlink3.mk"
-# Avoid creating a fake zlib.pc, because if it does
-# we will add a Requires for it to our .pc file
-CHECK_BUILTIN.zlib:=yes
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/freetype2-32/PLIST b/freetype2-32/PLIST
deleted file mode 100644
index 80ab826db3..0000000000
--- a/freetype2-32/PLIST
+++ /dev/null
@@ -1,56 +0,0 @@
-@comment $NetBSD$
-emul/netbsd32/bin/freetype-config
-emul/netbsd32/include/freetype2/freetype/config/ftconfig.h
-emul/netbsd32/include/freetype2/freetype/config/ftheader.h
-emul/netbsd32/include/freetype2/freetype/config/ftmodule.h
-emul/netbsd32/include/freetype2/freetype/config/ftoption.h
-emul/netbsd32/include/freetype2/freetype/config/ftstdlib.h
-emul/netbsd32/include/freetype2/freetype/freetype.h
-emul/netbsd32/include/freetype2/freetype/ftadvanc.h
-emul/netbsd32/include/freetype2/freetype/ftbbox.h
-emul/netbsd32/include/freetype2/freetype/ftbdf.h
-emul/netbsd32/include/freetype2/freetype/ftbitmap.h
-emul/netbsd32/include/freetype2/freetype/ftbzip2.h
-emul/netbsd32/include/freetype2/freetype/ftcache.h
-emul/netbsd32/include/freetype2/freetype/ftchapters.h
-emul/netbsd32/include/freetype2/freetype/ftcid.h
-emul/netbsd32/include/freetype2/freetype/ftcolor.h
-emul/netbsd32/include/freetype2/freetype/ftdriver.h
-emul/netbsd32/include/freetype2/freetype/fterrdef.h
-emul/netbsd32/include/freetype2/freetype/fterrors.h
-emul/netbsd32/include/freetype2/freetype/ftfntfmt.h
-emul/netbsd32/include/freetype2/freetype/ftgasp.h
-emul/netbsd32/include/freetype2/freetype/ftglyph.h
-emul/netbsd32/include/freetype2/freetype/ftgxval.h
-emul/netbsd32/include/freetype2/freetype/ftgzip.h
-emul/netbsd32/include/freetype2/freetype/ftimage.h
-emul/netbsd32/include/freetype2/freetype/ftincrem.h
-emul/netbsd32/include/freetype2/freetype/ftlcdfil.h
-emul/netbsd32/include/freetype2/freetype/ftlist.h
-emul/netbsd32/include/freetype2/freetype/ftlzw.h
-emul/netbsd32/include/freetype2/freetype/ftmac.h
-emul/netbsd32/include/freetype2/freetype/ftmm.h
-emul/netbsd32/include/freetype2/freetype/ftmodapi.h
-emul/netbsd32/include/freetype2/freetype/ftmoderr.h
-emul/netbsd32/include/freetype2/freetype/ftotval.h
-emul/netbsd32/include/freetype2/freetype/ftoutln.h
-emul/netbsd32/include/freetype2/freetype/ftparams.h
-emul/netbsd32/include/freetype2/freetype/ftpfr.h
-emul/netbsd32/include/freetype2/freetype/ftrender.h
-emul/netbsd32/include/freetype2/freetype/ftsizes.h
-emul/netbsd32/include/freetype2/freetype/ftsnames.h
-emul/netbsd32/include/freetype2/freetype/ftstroke.h
-emul/netbsd32/include/freetype2/freetype/ftsynth.h
-emul/netbsd32/include/freetype2/freetype/ftsystem.h
-emul/netbsd32/include/freetype2/freetype/fttrigon.h
-emul/netbsd32/include/freetype2/freetype/fttypes.h
-emul/netbsd32/include/freetype2/freetype/ftwinfnt.h
-emul/netbsd32/include/freetype2/freetype/t1tables.h
-emul/netbsd32/include/freetype2/freetype/ttnameid.h
-emul/netbsd32/include/freetype2/freetype/tttables.h
-emul/netbsd32/include/freetype2/freetype/tttags.h
-emul/netbsd32/include/freetype2/ft2build.h
-emul/netbsd32/lib/freetype2/libfreetype.la
-emul/netbsd32/lib/freetype2/pkgconfig/freetype2.pc
-emul/netbsd32/man/man1/freetype-config.1
-emul/netbsd32/share/aclocal/freetype2.m4
diff --git a/freetype2-32/buildlink3.mk b/freetype2-32/buildlink3.mk
deleted file mode 100644
index b9364b9cc9..0000000000
--- a/freetype2-32/buildlink3.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:14 rillig Exp $
-
-BUILDLINK_TREE+= compat32_freetype2
-
-.if !defined(COMPAT32_FREETYPE2_BUILDLINK3_MK)
-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?= emul/netbsd32/include
-BUILDLINK_LIBDIRS.compat32_freetype2?= emul/netbsd32/lib/freetype2
-
-BUILDLINK_FILES.compat32_freetype2+= emul/netbsd32/bin/freetype-config
-
-FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/emul/netbsd32/bin/freetype-config
-CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-
-pkgbase := compat32_freetype2
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.compat32_freetype2:Mpng)
-CHECK_BUILTIN.compat32_freetype2:= yes
-.include "../../wip/freetype2-32/builtin.mk"
-CHECK_BUILTIN.compat32_freetype2:= no
-
-. if empty(USE_BUILTIN.compat32_freetype2:M[yY][eE][sS])
-. include "../../wip/png-32/buildlink3.mk"
-. endif
-.endif
-
-.endif # COMPAT32_FREETYPE2_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -compat32_freetype2
diff --git a/freetype2-32/builtin.mk b/freetype2-32/builtin.mk
deleted file mode 100644
index 4b9ce9e6da..0000000000
--- a/freetype2-32/builtin.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-# $NetBSD: builtin.mk,v 1.18 2018/05/04 08:40:11 adam Exp $
-
-BUILTIN_PKG:= freetype2
-
-BUILTIN_FIND_FILES_VAR:= H_FREETYPE2 H_FREETYPE2_NEW
-BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.h
-BUILTIN_FIND_FILES.H_FREETYPE2_NEW= ${X11BASE}/include/freetype2/freetype.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.freetype2)
-. if empty(H_FREETYPE2:M__nonexistent__)
-IS_BUILTIN.freetype2= yes
-. elif empty(H_FREETYPE2_NEW:M__nonexistent__)
-IS_BUILTIN.freetype2= yes
-H_FREETYPE2:= ${H_FREETYPE2_NEW}
-. else
-IS_BUILTIN.freetype2= no
-. endif
-.endif
-MAKEVARS+= IS_BUILTIN.freetype2
-
-###
-### 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.freetype2) && \
- !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) && \
- empty(H_FREETYPE2:M__nonexistent__)
-BUILTIN_VERSION.freetype2!= \
- ${AWK} 'BEGIN { p = ".0" } \
- /\#define[ ]*FREETYPE_MAJOR/ { M = $$3 } \
- /\#define[ ]*FREETYPE_MINOR/ { m = "."$$3 } \
- /\#define[ ]*FREETYPE_PATCH/ { p = "."$$3 } \
- END { printf "%s%s%s\n", M, m, p }' \
- ${H_FREETYPE2}
-BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2}
-.endif
-MAKEVARS+= BUILTIN_PKG.freetype2
-
-###
-### 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.freetype2)
-. if ${PREFER.freetype2} == "pkgsrc"
-USE_BUILTIN.freetype2= no
-. else
-USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2}
-. if defined(BUILTIN_PKG.freetype2) && \
- !empty(IS_BUILTIN.freetype2:M[yY][eE][sS])
-USE_BUILTIN.freetype2= yes
-. for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
-. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
-USE_BUILTIN.freetype2!= \
- if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2}; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. endif
-. endfor
-. endif
-. endif # PREFER.freetype2
-.endif
-MAKEVARS+= USE_BUILTIN.freetype2
-
-###
-### The section below only applies if we are not including this file
-### solely to determine whether a built-in implementation exists.
-###
-
-.include "../../mk/x11.builtin.mk"
-
-CHECK_BUILTIN.freetype2?= no
-.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
-
-. if !empty(USE_BUILTIN.freetype2:M[nN][oO])
-BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
-. else
-. if !empty(MACHINE_PLATFORM:MNetBSD-[67].*-*) && \
- (("${BUILTIN_VERSION.freetype2}" == "2.4.5") || \
- ("${BUILTIN_VERSION.freetype2}" == "2.5.3"))
-_FT2_VER_MAP.2.5.3=17.2.11
-_FT2_VER_MAP.2.4.5=13.0.7
-SUBST_CLASSES+= fx-ft2-pc-version
-SUBST_STAGE.fx-ft2-pc-version= post-wrapper
-SUBST_MESSAGE.fx-ft2-pc-version=Fixes wrong module version in freetype2.pc
-SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc
-SUBST_SED.fx-ft2-pc-version= -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|'
-. endif
-. endif
-
-.endif # CHECK_BUILTIN.freetype2
diff --git a/freetype2-32/distinfo b/freetype2-32/distinfo
deleted file mode 100644
index d85f11b0db..0000000000
--- a/freetype2-32/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.66 2019/04/02 07:17:17 adam Exp $
-
-SHA1 (freetype-2.10.0.tar.bz2) = f6abf03e0e3189a0de883981c57d3861b5d314f5
-RMD160 (freetype-2.10.0.tar.bz2) = 502cb1d6c0e778fdbc2498d086ab3c1120dd3d5b
-SHA512 (freetype-2.10.0.tar.bz2) = dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
-Size (freetype-2.10.0.tar.bz2) = 2743740 bytes
-SHA1 (patch-builds_unix_freetype-config.in) = 60217b884a0f50c90f89529eaf909ded2693e3be
-SHA1 (patch-builds_unix_unix-cc.in) = 39e5a3defda9e330b36f56e47a9a27c39eacddae
diff --git a/freetype2-32/options.mk b/freetype2-32/options.mk
deleted file mode 100644
index 8fd5b75a5b..0000000000
--- a/freetype2-32/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2016/09/12 18:06:44 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
-PKG_SUPPORTED_OPTIONS= png
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpng)
-CONFIGURE_ARGS+= --with-png=yes
-.include "../../graphics/png/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --with-png=no
-.endif
diff --git a/freetype2-32/patches/patch-builds_unix_freetype-config.in b/freetype2-32/patches/patch-builds_unix_freetype-config.in
deleted file mode 100644
index 45548c45f4..0000000000
--- a/freetype2-32/patches/patch-builds_unix_freetype-config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-builds_unix_freetype-config.in,v 1.1 2017/09/18 16:54:06 adam Exp $
-
-Do not substitute %PKG_CONFIG% as it ends with temporary DESTDIR.
-
---- builds/unix/freetype-config.in.orig 2017-09-18 15:52:06.000000000 +0000
-+++ builds/unix/freetype-config.in
-@@ -14,7 +14,7 @@ export LC_ALL
-
-
- # if `pkg-config' is available, use values from `freetype2.pc'
--%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
-+pkg-config --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
- if test $? -eq 0 ; then
- # note that option `--variable' is not affected by the
- # PKG_CONFIG_SYSROOT_DIR environment variable
-@@ -23,17 +23,17 @@ if test $? -eq 0 ; then
- export PKG_CONFIG_SYSROOT_DIR
- fi
-
-- prefix=`%PKG_CONFIG% --variable prefix freetype2`
-- exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
-+ prefix=`pkg-config --variable prefix freetype2`
-+ exec_prefix=`pkg-config --variable exec_prefix freetype2`
-
-- includedir=`%PKG_CONFIG% --variable includedir freetype2`
-- libdir=`%PKG_CONFIG% --variable libdir freetype2`
-+ includedir=`pkg-config --variable includedir freetype2`
-+ libdir=`pkg-config --variable libdir freetype2`
-
-- version=`%PKG_CONFIG% --modversion freetype2`
-+ version=`pkg-config --modversion freetype2`
-
-- cflags=`%PKG_CONFIG% --cflags freetype2`
-- dynamic_libs=`%PKG_CONFIG% --libs freetype2`
-- static_libs=`%PKG_CONFIG% --static --libs freetype2`
-+ cflags=`pkg-config --cflags freetype2`
-+ dynamic_libs=`pkg-config --libs freetype2`
-+ static_libs=`pkg-config --static --libs freetype2`
- else
- prefix="%prefix%"
- exec_prefix="%exec_prefix%"
diff --git a/freetype2-32/patches/patch-builds_unix_unix-cc.in b/freetype2-32/patches/patch-builds_unix_unix-cc.in
deleted file mode 100644
index 0c7ba448fe..0000000000
--- a/freetype2-32/patches/patch-builds_unix_unix-cc.in
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-builds_unix_unix-cc.in,v 1.2 2018/05/04 08:40:11 adam Exp $
-
-Provide tag to libtool.
-Use CFLAGS when compiling executables.
-
---- builds/unix/unix-cc.in.orig 2018-04-22 09:41:36.000000000 +0000
-+++ builds/unix/unix-cc.in
-@@ -88,7 +88,7 @@ ANSIFLAGS := @XX_ANSIFLAGS@
- # C compiler to use -- we use libtool!
- #
- CCraw := $(CC)
--CC := $(LIBTOOL) --mode=compile $(CCraw)
-+CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
-
- # Resource compiler to use on Cygwin/MinGW, usually windres.
- #
-@@ -108,14 +108,14 @@ LIB_CLOCK_GETTIME := @LIB_CLOCK_GETTIME@
- CCraw_build := @CC_BUILD@ # native CC of building system
- E_BUILD := @EXEEXT_BUILD@ # extension for executable on building system
- EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
--CCexe := $(CCraw_build) # used to compile `apinames' only
-+CCexe := $(CCraw_build) @CFLAGS@ # used to compile `apinames' only
-
-
- # Library linking
- #
--LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-+LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
- -rpath $(libdir) -version-info $(version_info) \
- $(LDFLAGS) -no-undefined \
-- -export-symbols $(EXPORTS_LIST)
-+ # -export-symbols $(EXPORTS_LIST)
-
- # EOF
Home |
Main Index |
Thread Index |
Old Index