Update to SDL_ttf-2.0.3

Uses FreeType 2.0 from XF4, drop print/freetype dependency.
--
no response from maintainer
This commit is contained in:
pvalchev 2001-07-20 20:32:42 +00:00
parent 9e113bd23a
commit 075462a113
6 changed files with 21 additions and 72 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/05/07 04:16:33 obecian Exp $ # $OpenBSD: Makefile,v 1.2 2001/07/20 20:32:42 pvalchev Exp $
COMMENT= "SDL TrueType fonts library" COMMENT= "SDL TrueType fonts library"
VER= 1.2.2 VER= 2.0.3
PROJ= SDL_ttf PROJ= SDL_ttf
DISTNAME= ${PROJ}-${VER} DISTNAME= ${PROJ}-${VER}
PKGNAME= sdl-ttf-${VER} PKGNAME= sdl-ttf-${VER}
@ -19,15 +19,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= SDL.:sdl-*-!no_x11:devel/sdl \ LIB_DEPENDS= SDL.:sdl-*-!no_x11:devel/sdl
ttf.1.::print/freetype
USE_X11= Yes USE_X11= Yes
SEPARATE_BUILD= concurrent SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/freetype" \ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (SDL_ttf-1.2.2.tar.gz) = d20518e0287f92e370758c09046e4524 MD5 (SDL_ttf-2.0.3.tar.gz) = 29d12d1b883bf834c291c93f52ba8dc5
RMD160 (SDL_ttf-1.2.2.tar.gz) = 4165b4008aa424bba658ccb61516fc92f3924798 RMD160 (SDL_ttf-2.0.3.tar.gz) = 22601fc43b9adf4050f2b5cd1fa7a36afcfdd410
SHA1 (SDL_ttf-1.2.2.tar.gz) = dd6b417cf3159f25f58d4fa84d9c174e2c672182 SHA1 (SDL_ttf-2.0.3.tar.gz) = 82e223ae8b2f5a2d99603ae107f292ee5b340696

View File

@ -1,10 +1,11 @@
--- Makefile.am.orig Sun May 6 15:40:36 2001 $OpenBSD: patch-Makefile_am,v 1.2 2001/07/20 20:32:43 pvalchev Exp $
+++ Makefile.am Sun May 6 15:41:51 2001 --- Makefile.am.orig Mon Jul 9 17:08:26 2001
@@ -14,7 +14,6 @@ EXTRA_DIST = \ +++ Makefile.am Mon Jul 9 17:08:31 2001
@@ -17,7 +17,6 @@ EXTRA_DIST = \
autogen.sh autogen.sh
libSDL_ttf_la_LDFLAGS = \ libSDL_ttf_la_LDFLAGS = \
- -release $(LT_RELEASE) \ - -release $(LT_RELEASE) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_ttf_la_LIBADD = libSDL_ttf_la_LIBADD =

View File

@ -1,11 +1,12 @@
--- Makefile.in.orig Sun May 6 15:40:40 2001 $OpenBSD: patch-Makefile_in,v 1.2 2001/07/20 20:32:43 pvalchev Exp $
+++ Makefile.in Sun May 6 15:42:27 2001 --- Makefile.in.orig Mon Jul 9 17:08:23 2001
@@ -97,7 +97,7 @@ libSDL_ttf_la_SOURCES = SDL_ttf.c +++ Makefile.in Mon Jul 9 17:08:42 2001
EXTRA_DIST = CHANGES autogen.sh @@ -98,7 +98,7 @@ libSDL_ttf_la_SOURCES = SDL_ttf.c
EXTRA_DIST = CHANGES VisualC.zip SDL_ttf.spec SDL_ttf.spec.in autogen.sh
-libSDL_ttf_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libSDL_ttf_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libSDL_ttf_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libSDL_ttf_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_ttf_la_LIBADD = libSDL_ttf_la_LIBADD =

View File

@ -1,51 +0,0 @@
--- ltconfig.orig Sun May 6 15:40:48 2001
+++ ltconfig Sun May 6 15:44:28 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1403,10 +1406,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2029,13 +2043,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/05/07 04:16:33 obecian Exp $ @comment $OpenBSD: PFRAG.shared,v 1.2 2001/07/20 20:32:43 pvalchev Exp $
lib/libSDL_ttf.so.2.0 lib/libSDL_ttf.so.0.3
DYNLIBDIR(%B) DYNLIBDIR(%B)