diff --git a/devel/sdl-pango/Makefile b/devel/sdl-pango/Makefile
new file mode 100644
index 00000000000..d707b007a80
--- /dev/null
+++ b/devel/sdl-pango/Makefile
@@ -0,0 +1,54 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot Exp $
+
+COMMENT=	"SDL wrapper around the Pango library"
+
+V=		0.1.2
+DISTNAME=	SDL_Pango-${V}
+PKGNAME=	sdl-pango-${V}
+SHARED_LIBS=	SDL_Pango 0.0	# .2.0
+CATEGORIES=	devel x11
+
+HOMEPAGE=	http://sdlpango.sourceforge.net/
+
+# LGPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdlpango/}
+MASTER_SITES0=	http://zarb.org/~gc/t/
+
+PATCHFILES=	SDL_Pango-0.1.2-API-adds.patch:0
+
+WANTLIB=	X11 Xau Xdmcp Xext expat fontconfig freetype m usbhid \
+		z glib-2.0 gmodule-2.0 gobject-2.0
+
+LIB_DEPENDS=	SDL.>=7::devel/sdl \
+		pango-1.0.>=1.3,pangoft2-1.0.>=1.3::devel/pango
+
+MODULES=	devel/gettext
+
+USE_X11=	Yes
+USE_LIBTOOL=	Yes
+
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=	${CONFIGURE_SHARED}
+
+# This regression test wants an X11 display
+REGRESS_IS_INTERACTIVE=	Yes
+REGRESS_FLAGS=	DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sdl-pango
+	${INSTALL_DATA} ${WRKSRC}/docs/html/{*.html,*.css,*.png} \
+		${PREFIX}/share/doc/sdl-pango
+
+do-regress:
+	cd ${WRKSRC}/test && \
+	${CXX} -o testbench testbench.c \
+		-I../src `sdl-config --cflags` \
+		`sdl-config --libs` -L../src/.libs -lSDL_Pango && \
+	${SETENV} ${REGRESS_FLAGS} LD_LIBRARY_PATH=${WRKBUILD}/src/.libs ./testbench markup.txt
+
+.include <bsd.port.mk>
diff --git a/devel/sdl-pango/distinfo b/devel/sdl-pango/distinfo
new file mode 100644
index 00000000000..eef4ba60a4b
--- /dev/null
+++ b/devel/sdl-pango/distinfo
@@ -0,0 +1,10 @@
+MD5 (SDL_Pango-0.1.2-API-adds.patch) = Xezz1+tyTidUivMUITGi9g==
+MD5 (SDL_Pango-0.1.2.tar.gz) = hbv5u3sc7gU4FU2t0EVBjA==
+RMD160 (SDL_Pango-0.1.2-API-adds.patch) = BSYC2zF1ItRZsVURQJbnHihmYpk=
+RMD160 (SDL_Pango-0.1.2.tar.gz) = 0lMc++cm0nBUygOXhyG8x2QTN5o=
+SHA1 (SDL_Pango-0.1.2-API-adds.patch) = IKhEGn4FHokoQAyJ3tu27xacfGU=
+SHA1 (SDL_Pango-0.1.2.tar.gz) = ww8pQdR22TYoUKFQ0py0qTcwr2g=
+SHA256 (SDL_Pango-0.1.2-API-adds.patch) = WpicestTn85kAyPTmVzKiROkuIafXGkLeFAexrXIbV0=
+SHA256 (SDL_Pango-0.1.2.tar.gz) = f3XTuXrPcHxpbqEmQkkGIE6/oHZgFi3pJRc83QJX66Q=
+SIZE (SDL_Pango-0.1.2-API-adds.patch) = 3624
+SIZE (SDL_Pango-0.1.2.tar.gz) = 405967
diff --git a/devel/sdl-pango/patches/patch-src_Makefile_in b/devel/sdl-pango/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..c5b92571d37
--- /dev/null
+++ b/devel/sdl-pango/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot Exp $
+--- src/Makefile.in.orig	Tue Nov 28 11:44:40 2006
++++ src/Makefile.in	Tue Nov 28 11:45:18 2006
+@@ -196,7 +196,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ lib_LTLIBRARIES = libSDL_Pango.la
+-libSDL_Pangoincludedir = $(includedir)
++libSDL_Pangoincludedir = $(includedir)/SDL
+ libSDL_Pangoinclude_HEADERS = SDL_Pango.h
+ libSDL_Pango_la_SOURCES = SDL_Pango.c
+ libSDL_Pango_la_LDFLAGS = \
diff --git a/devel/sdl-pango/patches/patch-src_SDL_Pango_h b/devel/sdl-pango/patches/patch-src_SDL_Pango_h
new file mode 100644
index 00000000000..f296f055e29
--- /dev/null
+++ b/devel/sdl-pango/patches/patch-src_SDL_Pango_h
@@ -0,0 +1,75 @@
+$OpenBSD: patch-src_SDL_Pango_h,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot Exp $
+--- src/SDL_Pango.h.orig	Tue Mar 27 10:12:28 2007
++++ src/SDL_Pango.h	Tue Mar 27 10:16:11 2007
+@@ -47,10 +47,10 @@ typedef struct _SDLPango_Matrix {
+ } SDLPango_Matrix;
+ 
+ const SDLPango_Matrix _MATRIX_WHITE_BACK
+-    = {255, 0, 0, 0,
+-       255, 0, 0, 0,
+-       255, 0, 0, 0,
+-       255, 255, 0, 0,};
++    = {{{255, 0, 0, 0},
++       {255, 0, 0, 0},
++       {255, 0, 0, 0},
++       {255, 255, 0, 0}}};
+ 
+ /*!
+     Specifies white back and black letter.
+@@ -58,40 +58,40 @@ const SDLPango_Matrix _MATRIX_WHITE_BACK
+ const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
+ 
+ const SDLPango_Matrix _MATRIX_BLACK_BACK
+-    = {0, 255, 0, 0,
+-       0, 255, 0, 0,
+-       0, 255, 0, 0,
+-       255, 255, 0, 0,};
++    = {{{0, 255, 0, 0},
++       {0, 255, 0, 0},
++       {0, 255, 0, 0},
++       {255, 255, 0, 0}}};
+ /*!
+     Specifies black back and white letter.
+ */
+ const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
+ 
+ const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
+-    = {0, 0, 0, 0,
+-       0, 0, 0, 0,
+-       0, 0, 0, 0,
+-       0, 255, 0, 0,};
++    = {{{0, 0, 0, 0},
++       {0, 0, 0, 0},
++       {0, 0, 0, 0},
++       {0, 255, 0, 0}}};
+ /*!
+     Specifies transparent back and black letter.
+ */
+ const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
+ 
+ const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
+-    = {255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       0, 255, 0, 0,};
++    = {{{255, 255, 0, 0},
++       {255, 255, 0, 0},
++       {255, 255, 0, 0},
++       {0, 255, 0, 0}}};
+ /*!
+     Specifies transparent back and white letter.
+ */
+ const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
+ 
+ const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
+-    = {255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       0, 0, 0, 0,};
++    = {{{255, 255, 0, 0},
++       {255, 255, 0, 0},
++       {255, 255, 0, 0},
++       {0, 0, 0, 0}}};
+ /*!
+     Specifies transparent back and transparent letter.
+     This is useful for KARAOKE like rendering.
diff --git a/devel/sdl-pango/pkg/DESCR b/devel/sdl-pango/pkg/DESCR
new file mode 100644
index 00000000000..98e39917c6f
--- /dev/null
+++ b/devel/sdl-pango/pkg/DESCR
@@ -0,0 +1,3 @@
+This library is a wrapper around the Pango library.
+It allows you to use TrueType fonts to render internationalized and
+tagged text in SDL applications.
diff --git a/devel/sdl-pango/pkg/PFRAG.shared b/devel/sdl-pango/pkg/PFRAG.shared
new file mode 100644
index 00000000000..f8bf6657df4
--- /dev/null
+++ b/devel/sdl-pango/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot Exp $
+@lib lib/libSDL_Pango.so.${LIBSDL_Pango_VERSION}
diff --git a/devel/sdl-pango/pkg/PLIST b/devel/sdl-pango/pkg/PLIST
new file mode 100644
index 00000000000..ec8ad55515b
--- /dev/null
+++ b/devel/sdl-pango/pkg/PLIST
@@ -0,0 +1,30 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot Exp $
+%%SHARED%%
+include/SDL/
+include/SDL/SDL_Pango.h
+lib/libSDL_Pango.a
+lib/libSDL_Pango.la
+lib/pkgconfig/
+lib/pkgconfig/SDL_Pango.pc
+share/doc/sdl-pango/
+share/doc/sdl-pango/_s_d_l___pango_8c.html
+share/doc/sdl-pango/_s_d_l___pango_8h-source.html
+share/doc/sdl-pango/_s_d_l___pango_8h.html
+share/doc/sdl-pango/annotated.html
+share/doc/sdl-pango/dir_000000.html
+share/doc/sdl-pango/dir_000001.html
+share/doc/sdl-pango/dir_000002.html
+share/doc/sdl-pango/dir_000003.html
+share/doc/sdl-pango/dir_000004.html
+share/doc/sdl-pango/doxygen.css
+share/doc/sdl-pango/doxygen.png
+share/doc/sdl-pango/files.html
+share/doc/sdl-pango/globals.html
+share/doc/sdl-pango/globals_enum.html
+share/doc/sdl-pango/globals_eval.html
+share/doc/sdl-pango/globals_func.html
+share/doc/sdl-pango/globals_type.html
+share/doc/sdl-pango/globals_vars.html
+share/doc/sdl-pango/index.html
+share/doc/sdl-pango/struct___s_d_l_pango___matrix-members.html
+share/doc/sdl-pango/struct___s_d_l_pango___matrix.html