6 files changed, 89 insertions, 24 deletions

diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index ea471ebcda70..7ba8b05b0c90 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	deltup
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTVERSION=	0.4.4
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://www.deltup.org/e107_files/downloads/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	novel@FreeBSD.org
@@ -18,6 +18,8 @@ COMMENT=	Source delta update program
 RUN_DEPENDS=	bdelta:${PORTSDIR}/misc/bdelta
 
 USE_OPENSSL=	yes
+USE_GMAKE=	yes
+
 ALL_TARGET=	deltup
 PLIST_FILES=	bin/deltup \
 		bin/bzip2_old
@@ -27,6 +29,9 @@ MAN1=		deltup.1
 PORTDOCS=	ChangeLog README
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/deltup ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/deltup.1 ${PREFIX}/man/man1
diff --git a/sysutils/deltup/distinfo b/sysutils/deltup/distinfo
index 27e0379e26dd..70b7740f21f0 100644
--- a/sysutils/deltup/distinfo
+++ b/sysutils/deltup/distinfo
@@ -1,3 +1,3 @@
-MD5 (deltup-0.4.2.tar.gz) = ac097b01b67719e51df8c6d677d28cd7
-SHA256 (deltup-0.4.2.tar.gz) = a4b20833130aa186b28fa6d936499513685f37888972e928778977187dbaa6a9
-SIZE (deltup-0.4.2.tar.gz) = 15714
+MD5 (deltup-0.4.4.tar.gz) = 3b8da493eec796bf4aa09f59f318a9cc
+SHA256 (deltup-0.4.4.tar.gz) = fba7f1a970a04b2b786402e55c017c667b065f1974154f2ba6a65c855357b744
+SIZE (deltup-0.4.4.tar.gz) = 14905
diff --git a/sysutils/deltup/files/patch-Makefile b/sysutils/deltup/files/patch-Makefile
index 0f379011d69b..3c2353f02e44 100644
--- a/sysutils/deltup/files/patch-Makefile
+++ b/sysutils/deltup/files/patch-Makefile
@@ -1,11 +1,22 @@
---- Makefile.orig	Sat Jul 19 22:25:26 2003
-+++ Makefile	Fri May 20 03:23:04 2005
-@@ -5,7 +5,7 @@
+--- Makefile.orig	2008-03-09 16:13:57.000000000 +0500
++++ Makefile	2008-03-09 16:16:06.000000000 +0500
+@@ -1,16 +1,16 @@
+ DESTDIR=
+-PREFIX=/usr
++PREFIX=%%PREFIX%%
+ BINDIR=$(PREFIX)/bin
+ 
+ CC = g++
+ 
+ objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o 
+-libs=-lstdc++ -lz -lbz2 -lssl
++libs=-lstdc++ -lz -lbz2 -lssl -lcrypt
+ 
  #edelta: edelta.cpp deltup
  #	gcc edelta.cpp ${CXXFLAGS} -o edelta
- deltup: deltup.cpp file.h linklist.h
--	gcc deltup.cpp ${CXXFLAGS} -o deltup -lstdc++ -lz -lbz2 -lssl
-+	${CXX} deltup.cpp ${CXXFLAGS} -o deltup -lstdc++ -lz -lbz2 -lssl -lcrypto
- install: deltup
- 	mkdir -p $(DESTDIR)$(BINDIR)
- 	install -m 755 mkdtu $(DESTDIR)$(BINDIR)
+ %.o : %.cpp
+-	${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE
++	${CC} -c $< -o $@ ${CXXFLAGS} -g #-Wall -pedantic #-DFIXED_FRAMERATE
+ 
+ all: deltup
+ 
diff --git a/sysutils/deltup/files/patch-bzip2.cpp b/sysutils/deltup/files/patch-bzip2.cpp
new file mode 100644
index 000000000000..df0526a0db1d
--- /dev/null
+++ b/sysutils/deltup/files/patch-bzip2.cpp
@@ -0,0 +1,38 @@
+--- bzip2.cpp.orig	2007-03-25 04:59:24.000000000 +0600
++++ bzip2.cpp		2008-03-09 11:19:55.000000000 +0500
+@@ -19,6 +19,7 @@
+ #include "system.h"
+ #include "tmpstore.h"
+ #include "bzip2.h"
++#include <stdio.h>
+
+ char *bzip2_compressor_name[MAX_BZIP2_COMPRESSORS] = {"0.9.0c", "1.0.2", "1.0.3", "1.0.4"};
+ char *bzip2_name[MAX_BZIP2_COMPRESSORS] = {NULL, NULL, NULL, NULL};
+@@ -31,14 +32,12 @@
+   system(command.c_str());
+
+   FILE * fp;
+-  char * line = NULL;
++  char line[2*CHAR_MAX];
+   string fname;
+-  size_t len = 0;
+-  ssize_t read;
+   fp = fopen(tempfile.c_str(), "r");
+   if (fp == NULL)
+        exit(EXIT_FAILURE);
+-  while ((read = getline(&line, &len, fp)) != -1) {
++  while (fgets(line, 2*CHAR_MAX, fp)!=NULL) {
+ //                 printf("Retrieved line of length %zu :\n", read);
+ //                 printf("%s", line);
+        char *v = strstr(line, "Version");
+@@ -56,8 +55,8 @@
+        }
+        fname = line;
+   }
+-  if (line)
+-       free(line);
++//  if (line)
++//      free(&line);
+   if (verbose) {
+     printf("found bzip2 compressors/decompressors:\n");
+     for (int i = 0; i < MAX_BZIP2_COMPRESSORS; ++i) {
diff --git a/sysutils/deltup/files/patch-deltup.cpp b/sysutils/deltup/files/patch-deltup.cpp
index 76817bfbdad6..5bb7ddc6dff9 100644
--- a/sysutils/deltup/files/patch-deltup.cpp
+++ b/sysutils/deltup/files/patch-deltup.cpp
@@ -1,19 +1,19 @@
---- deltup.cpp.orig	Fri May 27 18:53:49 2005
-+++ deltup.cpp	Fri May 27 18:55:24 2005
-@@ -748,14 +748,14 @@
- void applyPatchfile(char *fname) {
+--- deltup.cpp.orig	2007-07-13 09:22:20.000000000 +0600
++++ deltup.cpp		2008-03-08 23:18:08.000000000 +0500
+@@ -520,14 +520,14 @@
    IStream *f = new IFStream(fname);
    Injectable_IStream f2(*f);
--  if (((IFStream*)f)->bad()) {fprintf(stderr, "file is missing: %s\n", fname); return;}
-+  if (((IFStream*)f)->bad()) {fprintf(stderr, "file is missing: %s\n", fname); exit(1);}
-   int type = determine_filetype(f2);
+   if (((IFStream*)f)->bad()) {
+-    fprintf(stderr, "file is missing: %s\n", fname.c_str()); return;}
++    fprintf(stderr, "file is missing: %s\n", fname.c_str()); exit(1);}
+   unsigned type = determine_filetype(f2);
    delete f;
    switch (type) {
      case GZIP: f = new GZ_IFStream(fname); break;
      case BZIP2: f = new BZ_IFStream(fname); break;
      case DTU: f = new IFStream(fname); break;
--    case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname); return;
-+    case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname); exit(1);
+-    case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname.c_str()); return;
++    case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname.c_str()); exit(1);
      case TARBALL :
        f = new IFStream(fname);
        unsigned zero_count;
diff --git a/sysutils/deltup/files/patch-system.cpp b/sysutils/deltup/files/patch-system.cpp
new file mode 100644
index 000000000000..465a6b44f66e
--- /dev/null
+++ b/sysutils/deltup/files/patch-system.cpp
@@ -0,0 +1,11 @@
+--- system.cpp.orig	2007-03-25 04:45:52.000000000 +0600
++++ system.cpp		2008-03-08 22:51:00.000000000 +0500
+@@ -19,7 +19,7 @@
+ using namespace std;
+ #include "file.h"
+ #include "bpatch.h"
+-
++#include <sys/wait.h>
+ #include "filetypes.h"
+ 
+ bool verbose = false;