From owner-svn-ports-head@FreeBSD.ORG  Sat Mar 16 09:35:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EA6C049A;
 Sat, 16 Mar 2013 09:35:15 +0000 (UTC)
 (envelope-from novel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CBAED8F0;
 Sat, 16 Mar 2013 09:35:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2G9ZFX6097634;
 Sat, 16 Mar 2013 09:35:15 GMT (envelope-from novel@svn.freebsd.org)
Received: (from novel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2G9ZEb8097625;
 Sat, 16 Mar 2013 09:35:14 GMT (envelope-from novel@svn.freebsd.org)
Message-Id: <201303160935.r2G9ZEb8097625@svn.freebsd.org>
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Sat, 16 Mar 2013 09:35:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314345 - in head/sysutils/deltup: . 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Mar 2013 09:35:16 -0000

Author: novel
Date: Sat Mar 16 09:35:14 2013
New Revision: 314345
URL: http://svnweb.freebsd.org/changeset/ports/314345

Log:
  - Fix build [1]
  - Respect CC
  
  Reported by:	miwi [1]

Added:
  head/sysutils/deltup/files/patch-file.h   (contents, props changed)
Modified:
  head/sysutils/deltup/Makefile
  head/sysutils/deltup/files/patch-Makefile

Modified: head/sysutils/deltup/Makefile
==============================================================================
--- head/sysutils/deltup/Makefile	Sat Mar 16 09:04:41 2013	(r314344)
+++ head/sysutils/deltup/Makefile	Sat Mar 16 09:35:14 2013	(r314345)
@@ -52,8 +52,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/deltup.1 ${PREFIX}/man/man1
 pre-build:
 	@${REINPLACE_CMD} -e 's|-Wall -Winline -O2|-Wall -Winline -O2 ${CFLAGS}|' \
+		-e 's|CC=gcc|CC?=gcc|' \
 	${WRKSRC_BZIP2_102}/Makefile
 	@${REINPLACE_CMD} -e 's|-Wall -Winline -O -g|-Wall -Winline -O2 ${CFLAGS}|' \
+		-e 's|CC=gcc|CC?=gcc|' \
 	${WRKSRC_BZIP2_103}/Makefile
 	@cd ${WRKSRC_BZIP2_102}; ${GMAKE} bzip2; \
 	cd ${WRKSRC_BZIP2_103}; ${GMAKE} bzip2;

Modified: head/sysutils/deltup/files/patch-Makefile
==============================================================================
--- head/sysutils/deltup/files/patch-Makefile	Sat Mar 16 09:04:41 2013	(r314344)
+++ head/sysutils/deltup/files/patch-Makefile	Sat Mar 16 09:35:14 2013	(r314345)
@@ -1,12 +1,13 @@
---- Makefile.orig	2005-05-21 06:23:34.000000000 +0600
-+++ Makefile		2008-03-10 20:39:02.000000000 +0500
-@@ -1,16 +1,16 @@
+--- Makefile.orig	2005-05-21 04:23:34.000000000 +0400
++++ Makefile	2013-03-16 09:57:42.000000000 +0400
+@@ -1,21 +1,21 @@
  DESTDIR=
 -PREFIX=/usr
 +PREFIX=%%PREFIX%%
  BINDIR=$(PREFIX)/bin
  
- CC = g++
+-CC = g++
++CC ?= g++
  
 -objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o 
 +objfiles=bpatch.o bzip2.o gzip.o file.o system.o tmpstore.o deltup.o 
@@ -16,7 +17,13 @@
  #	gcc edelta.cpp ${CXXFLAGS} -o edelta
  %.o : %.cpp
 -	${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE
-+	${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic #-DFIXED_FRAMERATE
++	${CC} -c $< -o $@ ${CXXFLAGS}
  
  all: deltup
  
+ depend:
+-	gcc -MM *.cpp > .depend
++	${CC} -MM *.cpp > .depend
+ 	
+ deltup: $(objfiles)
+ 	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)

Added: head/sysutils/deltup/files/patch-file.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/deltup/files/patch-file.h	Sat Mar 16 09:35:14 2013	(r314345)
@@ -0,0 +1,29 @@
+--- file.h.orig	2013-03-16 09:40:32.000000000 +0400
++++ file.h	2013-03-16 09:41:06.000000000 +0400
+@@ -12,6 +12,8 @@
+  * Author: John Whitney <jjw@deltup.org>
+  */
+ 
++#include <zlib.h>
++
+ class IStream {
+ public:
+   virtual unsigned read(void *data, unsigned num) = 0;
+@@ -56,7 +58,7 @@
+ };
+ 
+ class GZ_IFStream : public IStream {
+-  void *file;
++  gzFile_s *file;
+ public:
+   GZ_IFStream(string fname);
+   virtual ~GZ_IFStream();
+@@ -65,7 +67,7 @@
+ };
+ 
+ class GZ_OFStream : public OStream {
+-  void *file;
++  gzFile_s *file;
+ public:
+   GZ_OFStream(string fname);
+   virtual ~GZ_OFStream();