From owner-freebsd-ports Mon Jul 1 10:50:23 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EDBC37B401 for ; Mon, 1 Jul 2002 10:50:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADC1543E13 for ; Mon, 1 Jul 2002 10:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g61Ho2JU090488 for ; Mon, 1 Jul 2002 10:50:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g61Ho2mi090487; Mon, 1 Jul 2002 10:50:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE9DF37B400 for ; Mon, 1 Jul 2002 10:42:25 -0700 (PDT) Received: from kartoffel.salatschuessel.net (p5084BDB9.dip.t-dialin.net [80.132.189.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 856C743E09 for ; Mon, 1 Jul 2002 10:42:23 -0700 (PDT) (envelope-from olivleh1@kartoffel.salatschuessel.net) Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1]) by kartoffel.salatschuessel.net (8.12.4/8.12.3) with ESMTP id g61Hfs78007571; Mon, 1 Jul 2002 19:41:54 +0200 (CEST) (envelope-from olivleh1@kartoffel.salatschuessel.net) Received: (from root@localhost) by kartoffel.salatschuessel.net (8.12.4/8.12.4/Submit) id g61HfmCr007570; Mon, 1 Jul 2002 19:41:48 +0200 (CEST) Message-Id: <200207011741.g61HfmCr007570@kartoffel.salatschuessel.net> Date: Mon, 1 Jul 2002 19:41:48 +0200 (CEST) From: Oliver Lehmann Reply-To: Oliver Lehmann To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann X-Send-Pr-Version: 3.113 Subject: ports/40083: update-port: devel/libuta Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40083 >Category: ports >Synopsis: update-port: devel/libuta >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 01 10:50:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.6-STABLE FreeBSD 4.6-STABLE #1: Tue Jun 25 19:22:57 CEST 2002 olivleh1@nudel.salatschuessel.net:/usr/obj/i386/usr/src/sys/KARTOFFEL i386 >Description: bring the libuta port up to date all patches under files/ are removed (and replaced by a REPLACE_CMD for loop) >How-To-Repeat: >Fix: diff -ruN libuta.old/Makefile /usr/ports/devel/libuta/Makefile --- libuta.old/Makefile Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/Makefile Mon Jul 1 19:36:40 2002 @@ -6,21 +6,51 @@ # PORTNAME= libuta -PORTVERSION= 0.3.38 +PORTVERSION= 0.4.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lehmann@ans-netz.de -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ sigc.1:${PORTSDIR}/devel/libsigc++ \ - SDL-1.1.4:${PORTSDIR}/devel/sdl12 \ - SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer + SDL-1.1.4:${PORTSDIR}/devel/sdl12 USE_FREETYPE= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1" +GNU_CONFIGURE= yes +USE_REINPLACE= yes -.include +CONFIGURE_ENV= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \ + LIBS="-L${LOCALBASE}/lib" + +SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \ + uta/pixelformat.h uta/rect.h uta/sge_blib.cc uta/sge_blib.h \ + uta/sge_draw.cc uta/sge_draw.h uta/sound.h uta/surface_io.cc \ + uta/surface.h uta/timer.cc + +.include + +.if exists(${LOCALBASE}/lib/libSDL_mixer.so.2) +WITH_SDL_MIXER= yes +.endif + +.if defined(WITH_SDL_MIXER) +LIB_DEPENDS+= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer +.endif + + +pre-everything:: + @${ECHO} "" + @${ECHO} "You may use the following build options:" + @${ECHO} "" + @${ECHO} " WITH_SDL_MIXER=yes Enable music and sound support" + @${ECHO} "" + +post-patch: +.for i in ${SDL11_FILES} + ${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/$i +.endfor + +.include diff -ruN libuta.old/distinfo /usr/ports/devel/libuta/distinfo --- libuta.old/distinfo Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/distinfo Mon Jul 1 19:27:05 2002 @@ -1 +1 @@ -MD5 (libuta-0.3.38.tar.gz) = 19e9b692fa046fb7c8e16c5cceaea232 +MD5 (libuta-0.4.1.tar.gz) = 102eebdf70941cd11ed36af9ba8726d6 diff -ruN libuta.old/files/patch-aa /usr/ports/devel/libuta/files/patch-aa --- libuta.old/files/patch-aa Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,60 +0,0 @@ - -$FreeBSD: ports/devel/libuta/files/patch-aa,v 1.4 2002/03/14 11:16:38 sobomax Exp $ - ---- configure.orig Thu Apr 12 12:21:35 2001 -+++ configure Thu Mar 14 13:09:31 2002 -@@ -7,6 +7,9 @@ - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - -+LIBS="$LIBS -L/usr/local/lib" -+SDL_CONFIG="/usr/local/bin/sdl11-config" -+ - # Defaults: - ac_help= - ac_default_prefix=/usr/local -@@ -3573,7 +3576,7 @@ - - CFLAGS= - CXXFLAGS= --CPPFLAGS=-Wall -+CPPFLAGS="$CPPFLAGS -Wall" - - case $win32 in - true) -@@ -4603,7 +4606,7 @@ - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs | sed 's/-lXxf86vm -lXxf86dga -lXv //g'` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -@@ -4627,7 +4630,7 @@ - #include - #include - #include --#include -+#include - - char* - my_strdup (char *str) -@@ -4717,7 +4720,7 @@ - #include "confdefs.h" - - #include --#include -+#include - - int main() { - return 0; -@@ -5042,7 +5045,7 @@ - cat > conftest.$ac_ext < -+#include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:5049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } diff -ruN libuta.old/files/patch-ab /usr/ports/devel/libuta/files/patch-ab --- libuta.old/files/patch-ab Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/color.h.orig Sat Mar 31 05:24:37 2001 -+++ uta/color.h Sat Mar 31 05:26:10 2001 -@@ -22,7 +22,7 @@ - #define _COLOR_H - - #include --#include -+#include - - namespace uta { - /// diff -ruN libuta.old/files/patch-ac /usr/ports/devel/libuta/files/patch-ac --- libuta.old/files/patch-ac Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/event.h.orig Sat Mar 31 05:24:44 2001 -+++ uta/event.h Sat Mar 31 05:26:20 2001 -@@ -21,7 +21,7 @@ - #ifndef _EVENT_H - #define _EVENT_H - --#include -+#include - #include "keysym.h" - #include "point.h" - diff -ruN libuta.old/files/patch-ad /usr/ports/devel/libuta/files/patch-ad --- libuta.old/files/patch-ad Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/keysym.h.orig Sat Mar 31 05:24:56 2001 -+++ uta/keysym.h Sat Mar 31 05:26:32 2001 -@@ -20,7 +20,7 @@ - #ifndef KEYSYM_H - #define KEYSYM_H - --#include -+#include - - namespace uta { - diff -ruN libuta.old/files/patch-ae /usr/ports/devel/libuta/files/patch-ae --- libuta.old/files/patch-ae Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/mutex.h.orig Sat Mar 31 05:25:05 2001 -+++ uta/mutex.h Sat Mar 31 05:26:54 2001 -@@ -22,7 +22,7 @@ - #ifndef _MUTEX_H_ - #define _MUTEX_H_ - --#include -+#include - - namespace uta { - diff -ruN libuta.old/files/patch-af /usr/ports/devel/libuta/files/patch-af --- libuta.old/files/patch-af Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-af Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/rect.h.orig Sat Mar 31 05:25:30 2001 -+++ uta/rect.h Sat Mar 31 05:27:27 2001 -@@ -21,7 +21,7 @@ - #ifndef _RECT_H - #define _RECT_H - --#include -+#include - - #include "point.h" - diff -ruN libuta.old/files/patch-ag /usr/ports/devel/libuta/files/patch-ag --- libuta.old/files/patch-ag Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ag Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- uta/sound.h.orig Sat Mar 31 05:25:38 2001 -+++ uta/sound.h Sat Mar 31 05:27:39 2001 -@@ -36,9 +36,9 @@ - #endif - - #ifdef HAVE_MIXER --#include -+#include - #else --#include -+#include - #endif - - namespace uta { diff -ruN libuta.old/files/patch-ah /usr/ports/devel/libuta/files/patch-ah --- libuta.old/files/patch-ah Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ah Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/surface.h.orig Sat Mar 31 05:25:49 2001 -+++ uta/surface.h Sat Mar 31 05:27:49 2001 -@@ -22,7 +22,7 @@ - #ifndef _SURFACE_H_ - #define _SURFACE_H_ - --#include -+#include - - #include "color.h" - #include "point.h" diff -ruN libuta.old/files/patch-ai /usr/ports/devel/libuta/files/patch-ai --- libuta.old/files/patch-ai Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ai Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/sge_blib.h.orig Sat Mar 31 05:44:18 2001 -+++ uta/sge_blib.h Sat Mar 31 05:38:40 2001 -@@ -18,7 +18,7 @@ - #ifndef sge_blib_H - #define sge_blib_H - --#include -+#include - #include "sge_internal.h" - - diff -ruN libuta.old/files/patch-aj /usr/ports/devel/libuta/files/patch-aj --- libuta.old/files/patch-aj Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-aj Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/sge_blib.cc.orig Sat Mar 31 05:40:36 2001 -+++ uta/sge_blib.cc Sat Mar 31 05:40:51 2001 -@@ -19,7 +19,7 @@ - * This is written by Johan E. Thélin and is slightly modified by me. - */ - --#include -+#include - #include "sge_draw.h" - #include "sge_blib.h" - diff -ruN libuta.old/files/patch-ak /usr/ports/devel/libuta/files/patch-ak --- libuta.old/files/patch-ak Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ak Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/sge_draw.cc.orig Sat Mar 31 05:41:03 2001 -+++ uta/sge_draw.cc Sat Mar 31 05:41:56 2001 -@@ -20,7 +20,7 @@ - * John Garrison's PowerPak - */ - --#include -+#include - #include - #include - #include diff -ruN libuta.old/files/patch-al /usr/ports/devel/libuta/files/patch-al --- libuta.old/files/patch-al Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-al Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/surface_io.cc.orig Sat Mar 31 05:41:28 2001 -+++ uta/surface_io.cc Sat Mar 31 05:42:29 2001 -@@ -79,7 +79,7 @@ - #include - - #include --#include -+#include - - namespace uta { - diff -ruN libuta.old/files/patch-am /usr/ports/devel/libuta/files/patch-am --- libuta.old/files/patch-am Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-am Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/timer.cc.orig Sat Mar 31 05:41:43 2001 -+++ uta/timer.cc Sat Mar 31 05:42:38 2001 -@@ -18,7 +18,7 @@ - Boston, MA 02111-1307, SA. - */ - --#include -+#include - #include "timer.h" - - #include diff -ruN libuta.old/files/patch-an /usr/ports/devel/libuta/files/patch-an --- libuta.old/files/patch-an Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-an Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/pixelformat.h.orig Sat Mar 31 05:51:51 2001 -+++ uta/pixelformat.h Sat Mar 31 05:52:22 2001 -@@ -27,7 +27,7 @@ - - - //just for typedefs ... --#include -+#include - - #include - #include diff -ruN libuta.old/files/patch-ao /usr/ports/devel/libuta/files/patch-ao --- libuta.old/files/patch-ao Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ao Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- uta/sge_draw.h.orig Sat Mar 31 05:52:07 2001 -+++ uta/sge_draw.h Sat Mar 31 05:52:34 2001 -@@ -18,7 +18,7 @@ - #ifndef sge_draw_H - #define sge_draw_H - --#include -+#include - #include "sge_internal.h" - - diff -ruN libuta.old/files/patch-ap /usr/ports/devel/libuta/files/patch-ap --- libuta.old/files/patch-ap Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ap Thu Jan 1 01:00:00 1970 @@ -1,62 +0,0 @@ ---- acinclude.m4.orig Tue Nov 21 11:10:07 2000 -+++ acinclude.m4 Sat Mar 31 06:08:52 2001 -@@ -606,8 +606,8 @@ - CHECK_LIB_HEADER_VERSION( - SDL, - SDL_Init, -- SDL/SDL.h, -- SDL/SDL_version.h, -+ SDL11/SDL.h, -+ SDL11/SDL_version.h, - SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL, - $1, - http://www.devolution.com/~slouken/SDL/SDL-0.10/src/SDL-$1.tar.gz) -@@ -618,7 +618,7 @@ - [ - TEST_SKIP( - [ -- AC_CHECK_HEADER(SDL/SDL_mixer.h, -+ AC_CHECK_HEADER(SDL11/SDL_mixer.h, - [ - AC_DEFINE(HAVE_MIXER)) - AC_CHECK_LIB([ -@@ -1027,13 +1027,13 @@ - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl11-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ SDL_CONFIG=$sdl_prefix/bin/sdl11-config - fi - fi - -@@ -1067,7 +1067,7 @@ - #include - #include - #include --#include -+#include - - char* - my_strdup (char *str) -@@ -1141,7 +1141,7 @@ - LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ - #include --#include -+#include - ], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" -@@ -1292,4 +1292,4 @@ - AC_SUBST(SIGC_CFLAGS) - AC_SUBST(SIGC_LIBS) - --]) -+]) diff -ruN libuta.old/files/patch-aq /usr/ports/devel/libuta/files/patch-aq --- libuta.old/files/patch-aq Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-aq Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.in.orig Sat Mar 31 06:01:00 2001 -+++ configure.in Sat Mar 31 06:01:12 2001 -@@ -186,7 +186,7 @@ - ]) - AM_CONDITIONAL(SMPEG_AVAILABLE, test x$have_smpeg = xyes) - --AC_CHECK_HEADER(SDL/SDL_mixer.h,AC_CHECK_LIB(SDL_mixer, Mix_SetPostMix, [ -+AC_CHECK_HEADER(SDL11/SDL_mixer.h,AC_CHECK_LIB(SDL_mixer, Mix_SetPostMix, [ - MIXLIBS=-lSDL_mixer - AC_DEFINE(HAVE_MIXER) - ])) diff -ruN libuta.old/files/patch-ar /usr/ports/devel/libuta/files/patch-ar --- libuta.old/files/patch-ar Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/files/patch-ar Thu Jan 1 01:00:00 1970 @@ -1,56 +0,0 @@ ---- aclocal.m4.orig Wed Mar 21 13:44:06 2001 -+++ aclocal.m4 Sat Mar 31 06:09:47 2001 -@@ -618,8 +618,8 @@ - CHECK_LIB_HEADER_VERSION( - SDL, - SDL_Init, -- SDL/SDL.h, -- SDL/SDL_version.h, -+ SDL11/SDL.h, -+ SDL11/SDL_version.h, - SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL, - $1, - http://www.devolution.com/~slouken/SDL/SDL-0.10/src/SDL-$1.tar.gz) -@@ -630,7 +630,7 @@ - [ - TEST_SKIP( - [ -- AC_CHECK_HEADER(SDL/SDL_mixer.h, -+ AC_CHECK_HEADER(SDL11/SDL_mixer.h, - [ - AC_DEFINE(HAVE_MIXER)) - AC_CHECK_LIB([ -@@ -1039,13 +1039,13 @@ - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl11-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ SDL_CONFIG=$sdl_prefix/bin/sdl11-config - fi - fi - -@@ -1079,7 +1079,7 @@ - #include - #include - #include --#include -+#include - - char* - my_strdup (char *str) -@@ -1153,7 +1153,7 @@ - LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ - #include --#include -+#include - ], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" diff -ruN libuta.old/pkg-plist /usr/ports/devel/libuta/pkg-plist --- libuta.old/pkg-plist Mon Jul 1 18:49:44 2002 +++ /usr/ports/devel/libuta/pkg-plist Mon Jul 1 19:38:58 2002 @@ -1,6 +1,8 @@ bin/uta-config +lib/libuta.la lib/libuta.so -lib/libuta-0.3.so.38 +lib/libuta-0.4.so +lib/libuta-0.4.so.0 lib/libuta.a include/uta/debug.h include/uta/color.h >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message