6 files changed, 121 insertions, 9 deletions

diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index 0cacc576454d..6f2a1377525e 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	sdlmm
-PORTVERSION=	0.1.5
+PORTVERSION=	0.1.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,9 +22,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG}
 INSTALLS_SHLIB=	yes
 
-MAN3=	SDLmm.3 SDLmm__Audio.3 SDLmm__BaseSurface.3 SDLmm__CD.3 \
-	SDLmm__Display.3 SDLmm__Event.3 SDLmm__EventHandler.3 \
-	SDLmm__Joystick.3 SDLmm__SRect.3 SDLmm__Surface.3 SDLmm__Timer.3 \
-	SDLmm__VideoInfo.3
+MAN3=	SDLmm.3 SDLmm_Audio.3 SDLmm_BaseSurface.3 SDLmm_CD.3 SDLmm_ColorRGB.3 \
+	SDLmm_ColorRGBA.3 SDLmm_Display.3 SDLmm_Event.3 SDLmm_EventHandler.3 \
+	SDLmm_Joystick.3 SDLmm_PixelFormat.3 SDLmm_SPoint.3 SDLmm_SRect.3 \
+	SDLmm_Surface.3 SDLmm_Timer.3 SDLmm_VideoInfo.3 SDLmm_todo.3 sdlmm.h.3
 
 .include <bsd.port.mk>
diff --git a/devel/sdlmm/distinfo b/devel/sdlmm/distinfo
index e2701c922aad..bdfbf1d17ff3 100644
--- a/devel/sdlmm/distinfo
+++ b/devel/sdlmm/distinfo
@@ -1 +1 @@
-MD5 (SDLmm-0.1.5.tar.gz) = b3441a46111e8cd0b2388ad0d22b52ab
+MD5 (SDLmm-0.1.8.tar.gz) = 8221bd80629e48eb64247a0ffb5dff0a
diff --git a/devel/sdlmm/files/patch-configure b/devel/sdlmm/files/patch-configure
new file mode 100644
index 000000000000..f146b4c7a1d2
--- /dev/null
+++ b/devel/sdlmm/files/patch-configure
@@ -0,0 +1,77 @@
+
+$FreeBSD$
+
+--- configure	2001/09/03 14:45:25	1.1
++++ configure	2001/09/03 14:47:10
+@@ -5888,7 +5888,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+-    CXXFLAGS="$OLD_CXXFLAGS -O3"
++#    CXXFLAGS="$OLD_CXXFLAGS -O3"
+     if test "$cross_compiling" = yes; then
+   sdlmm_cv_option_O3=no
+ else
+@@ -5919,7 +5919,7 @@
+   CXXFLAGS="$OLD_CXXFLAGS"
+   
+   if test x"$sdlmm_cv_option_O3" = "xyes" ; then
+-    OPTIMIZE="$OPTIMIZE -O3"
++#    OPTIMIZE="$OPTIMIZE -O3"
+     echo "$ac_t""yes" 1>&6
+   else
+     echo "$ac_t""no" 1>&6
+@@ -5934,7 +5934,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+-    CXXFLAGS="$OLD_CXXFLAGS -O2"
++#    CXXFLAGS="$OLD_CXXFLAGS -O2"
+     if test "$cross_compiling" = yes; then
+   sdlmm_cv_option_O2=yes
+ else
+@@ -5965,7 +5965,7 @@
+   CXXFLAGS="$OLD_CXXFLAGS"
+   
+   if test x"$sdlmm_cv_option_O2" = "xyes" ; then
+-    OPTIMIZE="$OPTIMIZE -O2"
++#    OPTIMIZE="$OPTIMIZE -O2"
+     echo "$ac_t""yes" 1>&6
+   else
+     echo "$ac_t""no" 1>&6
+@@ -7813,7 +7813,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+-    CXXFLAGS="$OLD_CXXFLAGS -O3"
++#    CXXFLAGS="$OLD_CXXFLAGS -O3"
+     if test "$cross_compiling" = yes; then
+   sdlmm_cv_option_O3=no
+ else
+@@ -7844,7 +7844,7 @@
+   CXXFLAGS="$OLD_CXXFLAGS"
+   
+   if test x"$sdlmm_cv_option_O3" = "xyes" ; then
+-    OPTIMIZE="$OPTIMIZE -O3"
++#    OPTIMIZE="$OPTIMIZE -O3"
+     echo "$ac_t""yes" 1>&6
+   else
+     echo "$ac_t""no" 1>&6
+@@ -7859,7 +7859,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+-    CXXFLAGS="$OLD_CXXFLAGS -O2"
++#    CXXFLAGS="$OLD_CXXFLAGS -O2"
+     if test "$cross_compiling" = yes; then
+   sdlmm_cv_option_O2=yes
+ else
+@@ -7890,7 +7890,7 @@
+   CXXFLAGS="$OLD_CXXFLAGS"
+   
+   if test x"$sdlmm_cv_option_O2" = "xyes" ; then
+-    OPTIMIZE="$OPTIMIZE -O2"
++#    OPTIMIZE="$OPTIMIZE -O2"
+     echo "$ac_t""yes" 1>&6
+   else
+     echo "$ac_t""no" 1>&6
diff --git a/devel/sdlmm/files/patch-ltmain.sh b/devel/sdlmm/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0f6b0aedeaa7
--- /dev/null
+++ b/devel/sdlmm/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/09/03 14:42:51	1.1
++++ ltmain.sh	2001/09/03 14:43:12
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/sdlmm/files/patch-src::Makefile.in b/devel/sdlmm/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..24207e702a59
--- /dev/null
+++ b/devel/sdlmm/files/patch-src::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.in	2001/09/03 14:43:41	1.1
++++ src/Makefile.in	2001/09/03 14:43:55
+@@ -99,7 +99,7 @@
+ 
+ libSDLmm_la_SOURCES = sdlmm_global.cpp sdlmm_basesurface.cpp sdlmm_surface.cpp sdlmm_display.cpp sdlmm_pixelformat.cpp 	sdlmm_srect.cpp sdlmm_event.cpp sdlmm_audio.cpp sdlmm_timer.cpp 	sdlmm_joystick.cpp sdlmm_cd.cpp sdlmm_videoinfo.cpp
+ 
+-libSDLmm_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libSDLmm_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ # The directory where the include files will be installed
diff --git a/devel/sdlmm/pkg-plist b/devel/sdlmm/pkg-plist
index 75ee27392e8a..0c2aed2b0c3b 100644
--- a/devel/sdlmm/pkg-plist
+++ b/devel/sdlmm/pkg-plist
@@ -1,21 +1,24 @@
 bin/sdlmm-config
 include/SDLmm/sdlmm.h
 include/SDLmm/sdlmm_audio.h
+include/SDLmm/sdlmm_autoconfig.h
 include/SDLmm/sdlmm_basesurface.h
 include/SDLmm/sdlmm_cd.h
+include/SDLmm/sdlmm_color.h
+include/SDLmm/sdlmm_config.h
 include/SDLmm/sdlmm_display.h
 include/SDLmm/sdlmm_event.h
 include/SDLmm/sdlmm_eventhandler.h
 include/SDLmm/sdlmm_global.h
 include/SDLmm/sdlmm_joystick.h
+include/SDLmm/sdlmm_pixelformat.h
+include/SDLmm/sdlmm_spoint.h
 include/SDLmm/sdlmm_srect.h
 include/SDLmm/sdlmm_surface.h
 include/SDLmm/sdlmm_timer.h
 include/SDLmm/sdlmm_videoinfo.h
-lib/libSDLmm-0.1.so
-lib/libSDLmm-0.1.so.4
 lib/libSDLmm.a
-lib/libSDLmm.la
 lib/libSDLmm.so
+lib/libSDLmm.so.8
 share/aclocal/sdlmm.m4
 @dirrm include/SDLmm