From owner-svn-ports-all@FreeBSD.ORG Mon Jan 20 01:34:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71AACE2E; Mon, 20 Jan 2014 01:34:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C81E1F90; Mon, 20 Jan 2014 01:34:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0K1YtNH004125; Mon, 20 Jan 2014 01:34:55 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0K1YsgP004120; Mon, 20 Jan 2014 01:34:54 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201401200134.s0K1YsgP004120@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 20 Jan 2014 01:34:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340361 - in head/devel/bennugd-modules: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jan 2014 01:34:55 -0000 Author: amdmi3 Date: Mon Jan 20 01:34:53 2014 New Revision: 340361 URL: http://svnweb.freebsd.org/changeset/ports/340361 QAT: https://qat.redports.org/buildarchive/r340361/ Log: - Update to svn20130912 - Support staging - Fix build on 10.x Deleted: head/devel/bennugd-modules/files/patch-include-crypt.h head/devel/bennugd-modules/files/patch-mod__map-file__png.c Modified: head/devel/bennugd-modules/Makefile head/devel/bennugd-modules/distinfo head/devel/bennugd-modules/files/patch-configure head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c head/devel/bennugd-modules/pkg-plist Modified: head/devel/bennugd-modules/Makefile ============================================================================== --- head/devel/bennugd-modules/Makefile Mon Jan 20 01:34:31 2014 (r340360) +++ head/devel/bennugd-modules/Makefile Mon Jan 20 01:34:53 2014 (r340361) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= modules -PORTVERSION= r20091106 -PORTREVISION= 4 +PORTVERSION= svn20130912 CATEGORIES= devel games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ PKGNAMEPREFIX= bennugd- @@ -12,21 +11,22 @@ DISTNAME= bennugd-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= High level open source game development suite, modules -BUILD_DEPENDS= ${LOCALBASE}/lib/libbgdrtm.so:${PORTSDIR}/devel/bennugd-core -RUN_DEPENDS= ${LOCALBASE}/lib/libbgdrtm.so:${PORTSDIR}/devel/bennugd-core -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libbgdrtm.so:${PORTSDIR}/devel/bennugd-core \ + libpng.so:${PORTSDIR}/graphics/png +USE_BZIP2= yes USE_SDL= sdl mixer GNU_CONFIGURE= yes +USES= pkgconfig CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd" +CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz" USE_DOS2UNIX= *.c WRKSRC= ${WRKDIR}/bennugd/${PORTNAME} -NO_STAGE= yes post-extract: @${CHMOD} a+x ${WRKSRC}/configure ${WRKSRC}/install-sh Modified: head/devel/bennugd-modules/distinfo ============================================================================== --- head/devel/bennugd-modules/distinfo Mon Jan 20 01:34:31 2014 (r340360) +++ head/devel/bennugd-modules/distinfo Mon Jan 20 01:34:53 2014 (r340361) @@ -1,2 +1,2 @@ -SHA256 (bennugd-r20091106.tar.gz) = bdef09e9da715b5001411bc8c8276e66120e904596050f2175cca5405c9cec12 -SIZE (bennugd-r20091106.tar.gz) = 1468705 +SHA256 (bennugd-svn20130912.tar.bz2) = 13da09c0078619c25c689b1d81777ff54f026dbbf7b5638d80b2c3077287e27d +SIZE (bennugd-svn20130912.tar.bz2) = 1092409 Modified: head/devel/bennugd-modules/files/patch-configure ============================================================================== --- head/devel/bennugd-modules/files/patch-configure Mon Jan 20 01:34:31 2014 (r340360) +++ head/devel/bennugd-modules/files/patch-configure Mon Jan 20 01:34:53 2014 (r340361) @@ -1,60 +1,11 @@ ---- configure.orig 2009-07-22 06:02:45.000000000 +0400 -+++ configure 2009-11-06 06:10:30.000000000 +0300 -@@ -10946,7 +10946,7 @@ - COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi" +--- configure.orig 2013-01-06 05:50:56.000000000 +0400 ++++ configure 2013-09-12 05:47:52.458664790 +0400 +@@ -11315,7 +11315,7 @@ + USE_OPENSSL=yes ;; - dragonfly*) -+ freebsd* | dragonfly*) ++ dragonfly* | freebsd*) COMMON_CFLAGS="-I/usr/local/include -Wall -DTARGET_BSD" COMMON_LDFLAGS="-pthread -L/usr/local/lib" - ;; -@@ -13073,13 +13073,13 @@ - { (exit 1); exit 1; }; } - fi - --{ $as_echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5 --$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for des_ecb_encrypt in -lcrypto" >&5 -+$as_echo_n "checking for des_ecb_encrypt in -lcrypto... " >&6; } - if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldes $LIBS" -+LIBS="-lcrypto $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -13093,11 +13093,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char des_ecb_encrypt (); -+char DES_ecb_encrypt (); - int - main () - { --return des_ecb_encrypt (); -+return DES_ecb_encrypt (); - ; - return 0; - } -@@ -13199,7 +13199,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in -@@ -13267,7 +13267,7 @@ - - fi - if test "x$ac_cv_header_des_h" = x""yes; then -- DESLIBS="-ldes" -+ DESLIBS="-lcrypto" - fi - - + LM=-lm Modified: head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c ============================================================================== --- head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c Mon Jan 20 01:34:31 2014 (r340360) +++ head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c Mon Jan 20 01:34:53 2014 (r340361) @@ -1,20 +1,20 @@ ---- mod_mem/mod_mem.c.orig 2009-06-15 22:34:24.000000000 +0400 -+++ mod_mem/mod_mem.c 2009-11-06 06:28:55.000000000 +0300 -@@ -128,7 +128,7 @@ +--- mod_mem/mod_mem.c.orig 2013-09-12 06:03:12.588226648 +0400 ++++ mod_mem/mod_mem.c 2013-09-12 06:03:50.452231577 +0400 +@@ -133,7 +133,7 @@ get_system_info( &info ); return B_PAGE_SIZE * ( info.max_pages - info.used_pages ); --#elif !defined(TARGET_MAC) -+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) +-#elif !defined(TARGET_MAC) && !defined(TARGET_WII) ++#elif !defined(TARGET_MAC) && !defined(TARGET_WII) && !defined(TARGET_BSD) /* Linux and other Unix (?) */ struct sysinfo meminf; int fv; -@@ -166,7 +166,7 @@ +@@ -171,7 +171,7 @@ get_system_info( &info ); return B_PAGE_SIZE * ( info.max_pages ); --#elif !defined(TARGET_MAC) -+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) +-#elif !defined(TARGET_MAC) && !defined(TARGET_WII) ++#elif !defined(TARGET_MAC) && !defined(TARGET_WII) && !defined(TARGET_BSD) /* Linux and other Unix (?) */ struct sysinfo meminf; int fv; Modified: head/devel/bennugd-modules/pkg-plist ============================================================================== --- head/devel/bennugd-modules/pkg-plist Mon Jan 20 01:34:31 2014 (r340360) +++ head/devel/bennugd-modules/pkg-plist Mon Jan 20 01:34:53 2014 (r340361) @@ -1,139 +1,97 @@ -lib/bennugd/libblit.a +lib/bennugd/libbgload.la +lib/bennugd/libbgload.so lib/bennugd/libblit.la lib/bennugd/libblit.so -lib/bennugd/libdraw.a lib/bennugd/libdraw.la lib/bennugd/libdraw.so -lib/bennugd/libfont.a lib/bennugd/libfont.la lib/bennugd/libfont.so -lib/bennugd/libgrbase.a lib/bennugd/libgrbase.la lib/bennugd/libgrbase.so -lib/bennugd/libjoy.a lib/bennugd/libjoy.la lib/bennugd/libjoy.so -lib/bennugd/libkey.a lib/bennugd/libkey.la lib/bennugd/libkey.so -lib/bennugd/libmouse.a +lib/bennugd/libmod_blendop.la +lib/bennugd/libmod_blendop.so +lib/bennugd/libmod_cd.la +lib/bennugd/libmod_cd.so +lib/bennugd/libmod_crypt.la +lib/bennugd/libmod_crypt.so +lib/bennugd/libmod_debug.la +lib/bennugd/libmod_debug.so +lib/bennugd/libmod_dir.la +lib/bennugd/libmod_dir.so +lib/bennugd/libmod_draw.la +lib/bennugd/libmod_draw.so +lib/bennugd/libmod_effects.la +lib/bennugd/libmod_effects.so +lib/bennugd/libmod_file.la +lib/bennugd/libmod_file.so +lib/bennugd/libmod_flic.la +lib/bennugd/libmod_flic.so +lib/bennugd/libmod_grproc.la +lib/bennugd/libmod_grproc.so +lib/bennugd/libmod_joy.la +lib/bennugd/libmod_joy.so +lib/bennugd/libmod_key.la +lib/bennugd/libmod_key.so +lib/bennugd/libmod_m7.la +lib/bennugd/libmod_m7.so +lib/bennugd/libmod_map.la +lib/bennugd/libmod_map.so +lib/bennugd/libmod_math.la +lib/bennugd/libmod_math.so +lib/bennugd/libmod_mathi.la +lib/bennugd/libmod_mathi.so +lib/bennugd/libmod_mem.la +lib/bennugd/libmod_mem.so +lib/bennugd/libmod_mouse.la +lib/bennugd/libmod_mouse.so +lib/bennugd/libmod_path.la +lib/bennugd/libmod_path.so +lib/bennugd/libmod_proc.la +lib/bennugd/libmod_proc.so +lib/bennugd/libmod_rand.la +lib/bennugd/libmod_rand.so +lib/bennugd/libmod_regex.la +lib/bennugd/libmod_regex.so +lib/bennugd/libmod_say.la +lib/bennugd/libmod_say.so +lib/bennugd/libmod_screen.la +lib/bennugd/libmod_screen.so +lib/bennugd/libmod_scroll.la +lib/bennugd/libmod_scroll.so +lib/bennugd/libmod_sort.la +lib/bennugd/libmod_sort.so +lib/bennugd/libmod_sound.la +lib/bennugd/libmod_sound.so +lib/bennugd/libmod_string.la +lib/bennugd/libmod_string.so +lib/bennugd/libmod_sys.la +lib/bennugd/libmod_sys.so +lib/bennugd/libmod_text.la +lib/bennugd/libmod_text.so +lib/bennugd/libmod_time.la +lib/bennugd/libmod_time.so +lib/bennugd/libmod_timers.la +lib/bennugd/libmod_timers.so +lib/bennugd/libmod_video.la +lib/bennugd/libmod_video.so +lib/bennugd/libmod_wm.la +lib/bennugd/libmod_wm.so lib/bennugd/libmouse.la lib/bennugd/libmouse.so -lib/bennugd/librender.a lib/bennugd/librender.la lib/bennugd/librender.so -lib/bennugd/libscroll.a lib/bennugd/libscroll.la lib/bennugd/libscroll.so -lib/bennugd/libsdlhandler.a lib/bennugd/libsdlhandler.la lib/bennugd/libsdlhandler.so -lib/bennugd/libtext.a lib/bennugd/libtext.la lib/bennugd/libtext.so -lib/bennugd/libvideo.a lib/bennugd/libvideo.la lib/bennugd/libvideo.so -lib/bennugd/libwm.a lib/bennugd/libwm.la lib/bennugd/libwm.so -lib/bennugd/mod_blendop.a -lib/bennugd/mod_blendop.la -lib/bennugd/mod_blendop.so -lib/bennugd/mod_cd.a -lib/bennugd/mod_cd.la -lib/bennugd/mod_cd.so -lib/bennugd/mod_crypt.a -lib/bennugd/mod_crypt.la -lib/bennugd/mod_crypt.so -lib/bennugd/mod_debug.a -lib/bennugd/mod_debug.la -lib/bennugd/mod_debug.so -lib/bennugd/mod_dir.a -lib/bennugd/mod_dir.la -lib/bennugd/mod_dir.so -lib/bennugd/mod_draw.a -lib/bennugd/mod_draw.la -lib/bennugd/mod_draw.so -lib/bennugd/mod_effects.a -lib/bennugd/mod_effects.la -lib/bennugd/mod_effects.so -lib/bennugd/mod_file.a -lib/bennugd/mod_file.la -lib/bennugd/mod_file.so -lib/bennugd/mod_flic.a -lib/bennugd/mod_flic.la -lib/bennugd/mod_flic.so -lib/bennugd/mod_grproc.a -lib/bennugd/mod_grproc.la -lib/bennugd/mod_grproc.so -lib/bennugd/mod_joy.a -lib/bennugd/mod_joy.la -lib/bennugd/mod_joy.so -lib/bennugd/mod_key.a -lib/bennugd/mod_key.la -lib/bennugd/mod_key.so -lib/bennugd/mod_m7.a -lib/bennugd/mod_m7.la -lib/bennugd/mod_m7.so -lib/bennugd/mod_map.a -lib/bennugd/mod_map.la -lib/bennugd/mod_map.so -lib/bennugd/mod_math.a -lib/bennugd/mod_math.la -lib/bennugd/mod_math.so -lib/bennugd/mod_mem.a -lib/bennugd/mod_mem.la -lib/bennugd/mod_mem.so -lib/bennugd/mod_mouse.a -lib/bennugd/mod_mouse.la -lib/bennugd/mod_mouse.so -lib/bennugd/mod_path.a -lib/bennugd/mod_path.la -lib/bennugd/mod_path.so -lib/bennugd/mod_proc.a -lib/bennugd/mod_proc.la -lib/bennugd/mod_proc.so -lib/bennugd/mod_rand.a -lib/bennugd/mod_rand.la -lib/bennugd/mod_rand.so -lib/bennugd/mod_regex.a -lib/bennugd/mod_regex.la -lib/bennugd/mod_regex.so -lib/bennugd/mod_say.a -lib/bennugd/mod_say.la -lib/bennugd/mod_say.so -lib/bennugd/mod_screen.a -lib/bennugd/mod_screen.la -lib/bennugd/mod_screen.so -lib/bennugd/mod_scroll.a -lib/bennugd/mod_scroll.la -lib/bennugd/mod_scroll.so -lib/bennugd/mod_sort.a -lib/bennugd/mod_sort.la -lib/bennugd/mod_sort.so -lib/bennugd/mod_sound.a -lib/bennugd/mod_sound.la -lib/bennugd/mod_sound.so -lib/bennugd/mod_string.a -lib/bennugd/mod_string.la -lib/bennugd/mod_string.so -lib/bennugd/mod_sys.a -lib/bennugd/mod_sys.la -lib/bennugd/mod_sys.so -lib/bennugd/mod_text.a -lib/bennugd/mod_text.la -lib/bennugd/mod_text.so -lib/bennugd/mod_time.a -lib/bennugd/mod_time.la -lib/bennugd/mod_time.so -lib/bennugd/mod_timers.a -lib/bennugd/mod_timers.la -lib/bennugd/mod_timers.so -lib/bennugd/mod_video.a -lib/bennugd/mod_video.la -lib/bennugd/mod_video.so -lib/bennugd/mod_wm.a -lib/bennugd/mod_wm.la -lib/bennugd/mod_wm.so @dirrm lib/bennugd