Bug 100994 - [maintainer-update] www/httrack: update to 3.40-2; make fetchable
Summary: [maintainer-update] www/httrack: update to 3.40-2; make fetchable
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ion-Mihai "IOnut" Tetcu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-07-28 18:40 UTC by Andrew Pogrebennyk
Modified: 2006-07-29 22:30 UTC (History)
0 users

See Also:

Attachments
httrack.diff (2.85 KB, patch)
2006-07-28 18:40 UTC, Andrew Pogrebennyk 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Pogrebennyk 2006-07-28 18:40:13 UTC 

    


    


      



        
          Comment 1
        

        
          Ion-Mihai "IOnut" Tetcu

        

        
            freebsd_committer
            freebsd_triage
        

        
          2006-07-28 18:43:00 UTC
        

      






Responsible Changed
From-To: freebsd-ports-bugs->itetcu

I'll take it.

    


    


      



        
          Comment 2
        

        
          Andrew Pogrebennyk

        

        
        

        
          2006-07-28 18:59:21 UTC
        

      






Sorry for mans in pkg-plist in previous patch. Here is the correct version:

diff -u -ruN httrack.orig/Makefile httrack/Makefile
--- httrack.orig/Makefile	Fri Jul 28 19:22:36 2006
+++ httrack/Makefile	Fri Jul 28 20:30:51 2006
@@ -6,24 +6,23 @@
 #

 PORTNAME=	httrack
-PORTVERSION=	3.33.16
-PORTREVISION=	1
+PORTVERSION=	3.40
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	miwi
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	http://www.httrack.com/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}

 MAINTAINER=	andrew.nau.ua@gmail.com
 COMMENT=	Easy-to-use offline browser utility and website copier

-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.`expr ${PORTREVISION} + 1`

 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes

-MAN1=		htsserver.1 httrack.1 webhttrack.1
+MAN1=		htsserver.1 httrack.1 proxytrack.1 webhttrack.1

 post-patch:
 	@${REINPLACE_CMD} -e 's|>&6,|>\&6|g ; \
diff -u -ruN httrack.orig/distinfo httrack/distinfo
--- httrack.orig/distinfo	Fri Jul 28 19:22:36 2006
+++ httrack/distinfo	Fri Jul 28 19:30:12 2006
@@ -1,3 +1,3 @@
-MD5 (httrack-3.33.tar.gz) = cd21a49afb9630a49d042936ccff3c0b
-SHA256 (httrack-3.33.tar.gz) =
b5dc7121672a4c46aaa082bd79aa5adaea458c28627f358ebfd7ea8bf91c28f7
-SIZE (httrack-3.33.tar.gz) = 1432715
+MD5 (httrack-3.40-2.tar.gz) = 0364c56ab1e5289935d4d3482d1b82cb
+SHA256 (httrack-3.40-2.tar.gz) =
09a0bd0cbba7880e272136174c8261308868586f3d77479d06180c0c62079832
+SIZE (httrack-3.40-2.tar.gz) = 1626291
diff -u -ruN httrack.orig/pkg-plist httrack/pkg-plist
--- httrack.orig/pkg-plist	Fri Jul 28 19:22:36 2006
+++ httrack/pkg-plist	Fri Jul 28 20:46:50 2006
@@ -1,5 +1,6 @@
 bin/htsserver
 bin/httrack
+bin/proxytrack
 bin/webhttrack
 include/httrack/config.h
 include/httrack/htsbasenet.h
@@ -158,6 +159,8 @@
 %%DOCSDIR%%/httrack-doc.html
 %%DATADIR%%/html
 %%DATADIR%%/icons/webhttrack.xpm
+%%DATADIR%%/lang.def
+%%DATADIR%%/lang.indexes
 %%DATADIR%%/lang/Bulgarian.txt
 %%DATADIR%%/lang/Castellano.txt
 %%DATADIR%%/lang/Cesky.txt
@@ -167,6 +170,7 @@
 %%DATADIR%%/lang/Deutsch.txt
 %%DATADIR%%/lang/Eesti.txt
 %%DATADIR%%/lang/English.txt
+%%DATADIR%%/lang/Finnish.txt
 %%DATADIR%%/lang/Francais.txt
 %%DATADIR%%/lang/Greek.txt
 %%DATADIR%%/lang/Italiano.txt
@@ -185,8 +189,6 @@
 %%DATADIR%%/lang/Svenska.txt
 %%DATADIR%%/lang/Turkish.txt
 %%DATADIR%%/lang/Ukrainian.txt
-%%DATADIR%%/lang.def
-%%DATADIR%%/lang.indexes
 %%DATADIR%%/libtest/callbacks-example-baselinks.c
 %%DATADIR%%/libtest/callbacks-example-contentfilter.c
 %%DATADIR%%/libtest/callbacks-example-displayheader.c

I should say I am not sure if I shold take into account this portlint's message:
FATAL: Makefile: DISTNAME contains a reference to PORTREVISION.  You
should only be using PORTVERSION
HTTrack developers stick to some odd naming conventions. This time, as
developers say, "3.40.3 is "3.40-2". Here is how main developer
explains this oddity:

The naming convention is a bit strange ; but necessary to be
"compatible" with the windows one (for example, 3.41.6 is "3.41-beta-1"
; which is more explicit than "3.41.6")

So I've decided that using PORTREVISION in DISTNAME is the only
possible solution.
Thanks!

--
Reagrds,
Andrew Pogrebennyk

    


    


      



        
          Comment 3
        

        
          Andrew Pogrebennyk

        

        
        

        
          2006-07-29 10:22:42 UTC
        

      






JFYI: I am discussing the compile issue on 4.x and 5.x with httrack 
developers. Do not commit it yet :)

-- 
Sincerely,
Andrew Pogrebennyk

    


    


      



        
          Comment 4
        

        
          Ion-Mihai "IOnut" Tetcu

        

        
            freebsd_committer
            freebsd_triage
        

        
          2006-07-29 15:42:25 UTC
        

      






State Changed
From-To: open->suspended

Suspend while maintianer works with developerto fix build on 4 and 5.

    


    


      



        
          Comment 5
        

        
          Andrew Pogrebennyk

        

        
        

        
          2006-07-29 21:25:07 UTC
        

      






Hello!

The following patch compiles well on FreeBSD 4.x, 5.x and 6.x. It may
be eventually commited :)

--- httrack.diff begins here ---
diff -u -ruN httrack.orig/Makefile httrack/Makefile
--- httrack.orig/Makefile	Fri Jul 28 19:22:36 2006
+++ httrack/Makefile	Fri Jul 28 20:30:51 2006
@@ -6,24 +6,23 @@
 #

 PORTNAME=	httrack
-PORTVERSION=	3.33.16
-PORTREVISION=	1
+PORTVERSION=	3.40
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	miwi
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	http://www.httrack.com/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}

 MAINTAINER=	andrew.nau.ua@gmail.com
 COMMENT=	Easy-to-use offline browser utility and website copier

-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.`expr ${PORTREVISION} + 1`

 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes

-MAN1=		htsserver.1 httrack.1 webhttrack.1
+MAN1=		htsserver.1 httrack.1 proxytrack.1 webhttrack.1

 post-patch:
 	@${REINPLACE_CMD} -e 's|>&6,|>\&6|g ; \
diff -u -ruN httrack.orig/distinfo httrack/distinfo
--- httrack.orig/distinfo	Fri Jul 28 19:22:36 2006
+++ httrack/distinfo	Fri Jul 28 19:30:12 2006
@@ -1,3 +1,3 @@
-MD5 (httrack-3.33.tar.gz) = cd21a49afb9630a49d042936ccff3c0b
-SHA256 (httrack-3.33.tar.gz) =
b5dc7121672a4c46aaa082bd79aa5adaea458c28627f358ebfd7ea8bf91c28f7
-SIZE (httrack-3.33.tar.gz) = 1432715
+MD5 (httrack-3.40-2.tar.gz) = 0364c56ab1e5289935d4d3482d1b82cb
+SHA256 (httrack-3.40-2.tar.gz) =
09a0bd0cbba7880e272136174c8261308868586f3d77479d06180c0c62079832
+SIZE (httrack-3.40-2.tar.gz) = 1626291
diff -u -ruN httrack.orig/files/patch-src-mmsrip-mms.h
httrack/files/patch-src-mmsrip-mms.h
--- httrack.orig/files/patch-src-mmsrip-mms.h	Thu Jan  1 03:00:00 1970
+++ httrack/files/patch-src-mmsrip-mms.h	Sat Jul 29 23:16:52 2006
@@ -0,0 +1,11 @@
+--- src/mmsrip/mms.h.orig	Mon Jan 23 20:30:43 2006
++++ src/mmsrip/mms.h	Sat Jul 29 14:35:04 2006
+@@ -46,7 +46,7 @@
+ #endif
+ typedef unsigned long long int uint64_t;
+ #else
+-#if defined(SOLARIS) || defined(sun)
++#if defined(SOLARIS) || defined(sun) || defined (__FreeBSD__)
+ #include <inttypes.h>
+ #else
+ #include <stdint.h>
diff -u -ruN httrack.orig/files/patch-src-proxy-store.h
httrack/files/patch-src-proxy-store.h
--- httrack.orig/files/patch-src-proxy-store.h	Thu Jan  1 03:00:00 1970
+++ httrack/files/patch-src-proxy-store.h	Sat Jul 29 23:10:33 2006
@@ -0,0 +1,11 @@
+--- src/proxy/store.h.orig	Sat Jul 29 00:15:48 2006
++++ src/proxy/store.h	Sat Jul 29 00:19:03 2006
+@@ -28,6 +28,8 @@
+ #ifndef WEBHTTRACK_PROXYTRACK_STORE
+ #define WEBHTTRACK_PROXYTRACK_STORE
+
++#include <pthread.h>
++
+ /* Proxy */
+
+ typedef struct _PT_Index _PT_Index;
diff -u -ruN httrack.orig/pkg-plist httrack/pkg-plist
--- httrack.orig/pkg-plist	Fri Jul 28 19:22:36 2006
+++ httrack/pkg-plist	Fri Jul 28 20:46:50 2006
@@ -1,5 +1,6 @@
 bin/htsserver
 bin/httrack
+bin/proxytrack
 bin/webhttrack
 include/httrack/config.h
 include/httrack/htsbasenet.h
@@ -158,6 +159,8 @@
 %%DOCSDIR%%/httrack-doc.html
 %%DATADIR%%/html
 %%DATADIR%%/icons/webhttrack.xpm
+%%DATADIR%%/lang.def
+%%DATADIR%%/lang.indexes
 %%DATADIR%%/lang/Bulgarian.txt
 %%DATADIR%%/lang/Castellano.txt
 %%DATADIR%%/lang/Cesky.txt
@@ -167,6 +170,7 @@
 %%DATADIR%%/lang/Deutsch.txt
 %%DATADIR%%/lang/Eesti.txt
 %%DATADIR%%/lang/English.txt
+%%DATADIR%%/lang/Finnish.txt
 %%DATADIR%%/lang/Francais.txt
 %%DATADIR%%/lang/Greek.txt
 %%DATADIR%%/lang/Italiano.txt
@@ -185,8 +189,6 @@
 %%DATADIR%%/lang/Svenska.txt
 %%DATADIR%%/lang/Turkish.txt
 %%DATADIR%%/lang/Ukrainian.txt
-%%DATADIR%%/lang.def
-%%DATADIR%%/lang.indexes
 %%DATADIR%%/libtest/callbacks-example-baselinks.c
 %%DATADIR%%/libtest/callbacks-example-contentfilter.c
 %%DATADIR%%/libtest/callbacks-example-displayheader.c
--- httrack.diff ends here ---

    


    


      



        
          Comment 6
        

        
          Ion-Mihai "IOnut" Tetcu

        

        
            freebsd_committer
            freebsd_triage
        

        
          2006-07-29 21:35:03 UTC
        

      






State Changed
From-To: suspended->open

new patch received

    


    


      



        
          Comment 7
        

        
          Ion-Mihai "IOnut" Tetcu

        

        
            freebsd_committer
            freebsd_triage
        

        
          2006-07-29 22:30:14 UTC
        

      






State Changed
From-To: open->closed

Committed. Thanks!