pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

codeblocks: Update to 16.01 and reset inactive maintainer



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jun 16 02:59:37 2016 +0200
Changeset:	823b21e72c526856de47fabd1726a0bea5c50c8a

Modified Files:
	codeblocks/Makefile
	codeblocks/distinfo
	codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
	codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
	codeblocks/patches/patch-src_sdk_wxpropgrid_configure
Removed Files:
	codeblocks/patches/patch-ac

Log Message:
codeblocks: Update to 16.01 and reset inactive maintainer

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=823b21e72c526856de47fabd1726a0bea5c50c8a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 codeblocks/Makefile                                    | 18 +++++++++---------
 codeblocks/distinfo                                    | 15 ++++++++-------
 codeblocks/patches/patch-ac                            | 14 --------------
 ...rc_plugins_contrib_wxContribItems_wxchart_configure |  8 +++++++-
 ...c_plugins_contrib_wxContribItems_wxthings_configure |  9 ++++++++-
 codeblocks/patches/patch-src_sdk_wxpropgrid_configure  |  9 ++++++++-
 6 files changed, 40 insertions(+), 33 deletions(-)

diffs:
diff --git a/codeblocks/Makefile b/codeblocks/Makefile
index c2d5cbb..c915b49 100644
--- a/codeblocks/Makefile
+++ b/codeblocks/Makefile
@@ -1,21 +1,19 @@
 # $NetBSD: Makefile,v 1.10 2015/09/15 11:26:40 realzhtw Exp $
 #
 
-PKGVERSION=	13.12
-DISTNAME=	codeblocks_${PKGVERSION}-1
-PKGNAME=	codeblocks-${PKGVERSION}
+DISTNAME=	codeblocks_16.01
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	devel
-MASTER_SITES=   http://downloads.sourceforge.net/project/codeblocks/Sources/13.12/
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=codeblocks/}
+# http://sourceforge.net/projects/codeblocks/files/Sources/16.01/codeblocks_16.01.tar.gz
 EXTRACT_SUFX=	.tar.gz
 
-BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
-
-MAINTAINER=	pkgsrc%blackmouse.biz@localhost
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.codeblocks.org/
 COMMENT=	Open source, cross platform, free C++ IDE
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}.release
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
@@ -24,10 +22,12 @@ USE_LANGUAGES=	c c++
 CONFIGURE_ARGS+=	--with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,codestat,dragscroll,envvars,help,keybinder,libfinder,profiler,regex,exporter,symtab
 # wxsmith makes error in build process
 
+BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
+
 PKGCONFIG_OVERRIDE+=	codeblocks.pc.in
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/codeblocks/distinfo b/codeblocks/distinfo
index cb30847..2296289 100644
--- a/codeblocks/distinfo
+++ b/codeblocks/distinfo
@@ -1,9 +1,10 @@
 $NetBSD: distinfo,v 1.4 2015/09/15 11:26:40 realzhtw Exp $
 
-SHA1 (codeblocks_13.12-1.tar.gz) = 3d16f977c9dcc0d857f61af3233a76d6a68609e3
-RMD160 (codeblocks_13.12-1.tar.gz) = e5e469431b792687ba029689b1107a0d735bce8b
-Size (codeblocks_13.12-1.tar.gz) = 17221056 bytes
-SHA1 (patch-ac) = acfe18d848e959ed62885c5efc8f6f2129acff5a
-SHA1 (patch-src_plugins_contrib_wxContribItems_wxchart_configure) = 4dffe936b6cd21388771db2828f9f322cbec32e7
-SHA1 (patch-src_plugins_contrib_wxContribItems_wxthings_configure) = 0143703b7ebbd98bae83aea189dc016f667779b6
-SHA1 (patch-src_sdk_wxpropgrid_configure) = b796c0a5b0ad1b44c1757b5b7a0f480c9ec5b929
+SHA1 (codeblocks_16.01.tar.gz) = 70aabe8a948dbaa919eb4b87bc74a600e0d93516
+RMD160 (codeblocks_16.01.tar.gz) = e98b034eb8d6cf52a89312f2d5eaa10b17f1355e
+SHA512 (codeblocks_16.01.tar.gz) = 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
+Size (codeblocks_16.01.tar.gz) = 20250097 bytes
+SHA1 (patch-src_plugins_contrib_wxContribItems_wxchart_configure) = 92ba9d66a6e4c571cc224361eadd5c0bec6c1a1c
+SHA1 (patch-src_plugins_contrib_wxContribItems_wxthings_configure) = 32a041c92bcf4d40826b3fa476580b4d05814885
+SHA1 (patch-src_sdk_wxpropgrid_configure) = 287c8d28f68070d1855067dfca35d3792c5161d7
+SHA1 (patch-src_src_prefix.cpp) = f7fe380a1e6453eb21ba8305d10ed3187db8f283
diff --git a/codeblocks/patches/patch-ac b/codeblocks/patches/patch-ac
deleted file mode 100644
index ad317e0..0000000
--- a/codeblocks/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/12/05 19:47:13 jsonn Exp $
-
---- src/src/prefix.cpp.orig	2013-11-17 19:33:49.000000000 +0000
-+++ src/src/prefix.cpp
-@@ -55,9 +55,6 @@ extern "C" {
- #endif /* __cplusplus */
- 
- 
--#undef NULL
--#define NULL ((void *) 0)
--
- #ifdef __GNUC__
- 	#define br_return_val_if_fail(expr,val) if (!(expr)) {fprintf (stderr, "** BinReloc (%s): assertion %s failed\n", __PRETTY_FUNCTION__, #expr); return val;}
- #else
diff --git a/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
index 7a31194..ca37451 100644
--- a/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
+++ b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxchart_configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/plugins/contrib/wxContribItems/wxchart/configure.orig	2013-11-17 19:34:00.000000000 +0000
+--- src/plugins/contrib/wxContribItems/wxchart/configure.orig	2016-01-23 16:43:13.000000000 +0000
 +++ src/plugins/contrib/wxContribItems/wxchart/configure
 @@ -5618,7 +5618,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
@@ -11,3 +11,9 @@ $NetBSD$
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
+@@ -7811,5 +7811,3 @@ echo "$as_me: error:
+         echo "  Now, just run make."
+         echo " ----------------------------------------------------------------"
+         echo
+-
+-
diff --git a/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
index b834d1e..98c46b7 100644
--- a/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
+++ b/codeblocks/patches/patch-src_plugins_contrib_wxContribItems_wxthings_configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/plugins/contrib/wxContribItems/wxthings/configure.orig	2013-11-17 19:34:01.000000000 +0000
+--- src/plugins/contrib/wxContribItems/wxthings/configure.orig	2016-01-23 16:43:14.000000000 +0000
 +++ src/plugins/contrib/wxContribItems/wxthings/configure
 @@ -4619,7 +4619,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6; 
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
@@ -11,3 +11,10 @@ $NetBSD$
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
+@@ -6966,6 +6966,3 @@ fi
+         echo "  Now, just run make."
+         echo " ----------------------------------------------------------------"
+         echo
+-
+-
+-
diff --git a/codeblocks/patches/patch-src_sdk_wxpropgrid_configure b/codeblocks/patches/patch-src_sdk_wxpropgrid_configure
index 333a253..462b3e5 100644
--- a/codeblocks/patches/patch-src_sdk_wxpropgrid_configure
+++ b/codeblocks/patches/patch-src_sdk_wxpropgrid_configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/sdk/wxpropgrid/configure.orig	2013-11-17 19:33:44.000000000 +0000
+--- src/sdk/wxpropgrid/configure.orig	2016-01-23 16:43:00.000000000 +0000
 +++ src/sdk/wxpropgrid/configure
 @@ -4628,7 +4628,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
@@ -11,3 +11,10 @@ $NetBSD$
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
+@@ -6835,6 +6835,3 @@ fi
+         echo "  Now, just run make."
+         echo " ----------------------------------------------------------------"
+         echo
+-
+-
+-


Home | Main Index | Thread Index | Old Index