Date: Mon, 20 Jan 2014 01:34:31 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340360 - in head/devel/bennugd-core: . files Message-ID: <201401200134.s0K1YVB3003955@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Jan 20 01:34:31 2014 New Revision: 340360 URL: http://svnweb.freebsd.org/changeset/ports/340360 QAT: https://qat.redports.org/buildarchive/r340360/ Log: - Update to svn20130912 - Support staging - Fix build on 10.x Deleted: head/devel/bennugd-core/files/patch-include-crypt.h Modified: head/devel/bennugd-core/Makefile head/devel/bennugd-core/distinfo head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c head/devel/bennugd-core/files/patch-configure Modified: head/devel/bennugd-core/Makefile ============================================================================== --- head/devel/bennugd-core/Makefile Mon Jan 20 01:24:53 2014 (r340359) +++ head/devel/bennugd-core/Makefile Mon Jan 20 01:34:31 2014 (r340360) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= core -PORTVERSION= r20091106 +PORTVERSION= svn20130912 CATEGORIES= devel games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ PKGNAMEPREFIX= bennugd- @@ -11,6 +11,7 @@ DISTNAME= bennugd-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= High level open source game development suite, core libs +USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir="${PREFIX}/libexec" SUB_FILES= bgdc bgdi @@ -20,13 +21,14 @@ USE_DOS2UNIX= *.c *.h ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= Segfaults on !i386 +CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz" + WRKSRC= ${WRKDIR}/bennugd/${PORTNAME} PLIST_FILES= bin/bgdc bin/bgdi \ libexec/bgdc libexec/bgdi \ - lib/libbgdrtm.a lib/libbgdrtm.la lib/libbgdrtm.so + lib/libbgdrtm.la lib/libbgdrtm.so -NO_STAGE= yes post-extract: @${CHMOD} a+x ${WRKSRC}/configure ${WRKSRC}/install-sh @@ -35,7 +37,7 @@ post-patch: ${WRKSRC}/configure post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/bgdi ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/bgdc ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/bgdi ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/bgdc ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/devel/bennugd-core/distinfo ============================================================================== --- head/devel/bennugd-core/distinfo Mon Jan 20 01:24:53 2014 (r340359) +++ head/devel/bennugd-core/distinfo Mon Jan 20 01:34:31 2014 (r340360) @@ -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-core/files/patch-bgdrtm-src-dirs.c ============================================================================== --- head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c Mon Jan 20 01:24:53 2014 (r340359) +++ head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c Mon Jan 20 01:34:31 2014 (r340360) @@ -1,13 +1,11 @@ ---- bgdrtm/src/dirs.c.orig 2009-07-09 05:10:52.000000000 +0400 -+++ bgdrtm/src/dirs.c 2009-11-06 05:50:02.000000000 +0300 -@@ -230,9 +230,7 @@ - /* Convert *.* to * */ - if ( fptr > path_final + 2 && fptr[ -1 ] == '*' && fptr[ -2 ] == '.' && fptr[ -3 ] == '*' ) fptr[ -2 ] = 0; +--- bgdrtm/src/dirs.c.orig 2013-09-12 05:40:07.257227650 +0400 ++++ bgdrtm/src/dirs.c 2013-09-12 05:40:48.926466619 +0400 +@@ -261,7 +261,7 @@ + /* Convert '*.*' to '*' */ + if ( fptr > hDir->pattern + 2 && fptr[ -1 ] == '*' && fptr[ -2 ] == '.' && fptr[ -3 ] == '*' ) fptr[ -2 ] = 0; --#if defined(TARGET_MAC) -- glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); --#elif defined(TARGET_BEOS) -+#if defined(TARGET_MAC) || defined(TARGET_BEOS) || defined(TARGET_BSD) - glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); +-#if defined(TARGET_MAC) || defined(TARGET_BEOS) ++#if defined(TARGET_MAC) || defined(TARGET_BEOS) || defined (TARGET_BSD) + r = glob( hDir->pattern, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); #else - glob( path_final, GLOB_ERR | GLOB_PERIOD | GLOB_NOSORT, NULL, &hDir->globd ); + r = glob( hDir->pattern, GLOB_ERR | GLOB_PERIOD | GLOB_NOSORT, NULL, &hDir->globd ); Modified: head/devel/bennugd-core/files/patch-configure ============================================================================== --- head/devel/bennugd-core/files/patch-configure Mon Jan 20 01:24:53 2014 (r340359) +++ head/devel/bennugd-core/files/patch-configure Mon Jan 20 01:34:31 2014 (r340360) @@ -1,60 +1,15 @@ ---- configure.orig 2009-07-22 06:02:45.000000000 +0400 -+++ configure 2009-11-06 06:00:29.000000000 +0300 -@@ -10929,7 +10929,7 @@ - COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi" +--- configure.orig 2013-01-06 05:50:56.000000000 +0400 ++++ configure 2013-09-12 05:48:18.186226351 +0400 +@@ -11277,10 +11277,10 @@ + USE_OPENSSL=no ;; - dragonfly*) -+ freebsd* | dragonfly*) ++ dragonfly* | freebsd*) INCLUDES="-I/usr/local/include" - COMMON_CFLAGS="-Wall -DTARGET_BSD" - COMMON_LDFLAGS="-L/usr/local/lib -lpthread" -@@ -12461,13 +12461,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 -@@ -12481,11 +12481,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; - } -@@ -12587,7 +12587,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <des.h> -+#include <openssl/des.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in -@@ -12655,7 +12655,7 @@ - - fi - if test "x$ac_cv_header_des_h" = x""yes; then -- DESLIBS="-ldes" -+ DESLIBS="-lcrypto" - fi - - + COMMON_CFLAGS="-Wall -DTARGET_BSD -DUSE_OPENSSL" +- COMMON_LDFLAGS="-L/usr/local/lib -lpthread" ++ COMMON_LDFLAGS="-L/usr/local/lib -pthread" + LIBSSL="crypto" + USE_OPENSSL=yes + ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401200134.s0K1YVB3003955>