diff --git a/devel/sdl-ttf/Makefile b/devel/sdl-ttf/Makefile index 2d36d72710b..203cc9c5f79 100644 --- a/devel/sdl-ttf/Makefile +++ b/devel/sdl-ttf/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.15 2003/03/02 05:25:39 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.16 2003/04/05 22:24:36 margarida Exp $ COMMENT= "SDL TrueType fonts library" -VER= 2.0.5 -PROJ= SDL_ttf -DISTNAME= ${PROJ}-${VER} -PKGNAME= sdl-ttf-${VER} +DISTNAME= SDL_ttf-2.0.6 +PKGNAME= ${DISTNAME:L:S/_/-/} CATEGORIES= devel graphics -MASTER_SITES= http://www.libsdl.org/projects/${PROJ}/release/ +MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/ @@ -19,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= SDL.::devel/sdl +LIB_DEPENDS= SDL::devel/sdl USE_X11= Yes diff --git a/devel/sdl-ttf/distinfo b/devel/sdl-ttf/distinfo index bc762d83e96..cb1b6612021 100644 --- a/devel/sdl-ttf/distinfo +++ b/devel/sdl-ttf/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL_ttf-2.0.5.tar.gz) = 1dec3052634a5902914669b5dcd41523 -RMD160 (SDL_ttf-2.0.5.tar.gz) = 925916f1cc04aa533b897a7a5d856613a8a1b0d0 -SHA1 (SDL_ttf-2.0.5.tar.gz) = fb1d7a4a548cf1cb68f66acafd0a7d543c09458d +MD5 (SDL_ttf-2.0.6.tar.gz) = 880ca22ac3e8beb5cca2326cc8069733 +RMD160 (SDL_ttf-2.0.6.tar.gz) = a9fedc74b90fb6b4c0d98199363997dd3a596829 +SHA1 (SDL_ttf-2.0.6.tar.gz) = d7defb55465ead668e0cc3c1602226d7b6892cb4 diff --git a/devel/sdl-ttf/patches/patch-Makefile_in b/devel/sdl-ttf/patches/patch-Makefile_in index 3c18826ff6d..63679531c96 100644 --- a/devel/sdl-ttf/patches/patch-Makefile_in +++ b/devel/sdl-ttf/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2003/03/02 05:25:39 pvalchev Exp $ ---- Makefile.in.orig Sat Apr 13 10:06:30 2002 -+++ Makefile.in Fri Feb 28 17:00:07 2003 -@@ -99,13 +99,13 @@ libSDL_ttf_la_SOURCES = SDL_ttf.c +$OpenBSD: patch-Makefile_in,v 1.4 2003/04/05 22:24:36 margarida Exp $ +--- Makefile.in.orig Fri Mar 7 00:48:17 2003 ++++ Makefile.in Mon Mar 10 05:16:30 2003 +@@ -100,7 +100,7 @@ libSDL_ttf_la_SOURCES = SDL_ttf.c EXTRA_DIST = CHANGES VisualC.zip PBProjects.tar.gz MPWmake.sea.bin SDL_ttf.spec SDL_ttf.spec.in autogen.sh @@ -10,39 +10,3 @@ $OpenBSD: patch-Makefile_in,v 1.3 2003/03/02 05:25:39 pvalchev Exp $ libSDL_ttf_la_LIBADD = --bin_PROGRAMS = showfont glfont -+bin_PROGRAMS = sdl-showfont glfont - --showfont_LDADD = libSDL_ttf.la -+sdl-showfont_LDADD = libSDL_ttf.la - glfont_LDADD = libSDL_ttf.la @GL_LIBS@ @MATHLIB@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -125,10 +125,10 @@ libSDL_ttf_la_DEPENDENCIES = - libSDL_ttf_la_OBJECTS = SDL_ttf.lo - PROGRAMS = $(bin_PROGRAMS) - --showfont_SOURCES = showfont.c --showfont_OBJECTS = showfont.o --showfont_DEPENDENCIES = libSDL_ttf.la --showfont_LDFLAGS = -+sdl-showfont_SOURCES = showfont.c -+sdl-showfont_OBJECTS = showfont.o -+sdl-showfont_DEPENDENCIES = libSDL_ttf.la -+sdl-showfont_LDFLAGS = - glfont_SOURCES = glfont.c - glfont_OBJECTS = glfont.o - glfont_DEPENDENCIES = libSDL_ttf.la -@@ -263,9 +263,9 @@ uninstall-binPROGRAMS: - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - --showfont: $(showfont_OBJECTS) $(showfont_DEPENDENCIES) -- @rm -f showfont -- $(LINK) $(showfont_LDFLAGS) $(showfont_OBJECTS) $(showfont_LDADD) $(LIBS) -+sdl-showfont: $(sdl-showfont_OBJECTS) $(sdl-showfont_DEPENDENCIES) -+ @rm -f sdl-showfont -+ $(LINK) $(sdl-showfont_LDFLAGS) $(sdl-showfont_OBJECTS) $(sdl-showfont_LDADD) $(LIBS) - - glfont: $(glfont_OBJECTS) $(glfont_DEPENDENCIES) - @rm -f glfont diff --git a/devel/sdl-ttf/pkg/PFRAG.shared b/devel/sdl-ttf/pkg/PFRAG.shared index 1bbad2afc5c..082754e08a4 100644 --- a/devel/sdl-ttf/pkg/PFRAG.shared +++ b/devel/sdl-ttf/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2002/05/04 11:27:28 mark Exp $ -lib/libSDL_ttf.so.0.5 -DYNLIBDIR(%B) +@comment $OpenBSD: PFRAG.shared,v 1.5 2003/04/05 22:24:36 margarida Exp $ +lib/libSDL_ttf.so.6.0 +DYNLIBDIR(%D/lib) diff --git a/devel/sdl-ttf/pkg/PLIST b/devel/sdl-ttf/pkg/PLIST index 917fd8f2021..4c3b037a649 100644 --- a/devel/sdl-ttf/pkg/PLIST +++ b/devel/sdl-ttf/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2003/03/02 05:25:39 pvalchev Exp $ -bin/glfont -bin/sdl-showfont +@comment $OpenBSD: PLIST,v 1.5 2003/04/05 22:24:36 margarida Exp $ include/SDL/SDL_ttf.h lib/libSDL_ttf.a lib/libSDL_ttf.la