Attachment #85130 for bug #121225

View | Details | Raw Unified | Return to bug 121225
Collapse All | Expand All




#

PORTNAME=	nzbget
PORTVERSION=	0.3.1
CATEGORIES=	news
MASTER_SITES=	SF


		uu.3:${PORTSDIR}/converters/uulib

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-parcheck
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
		LOCALBASE="${LOCALBASE}"
USE_GMAKE=	yes

PLIST_FILES=	bin/nzbget etc/nzbget.conf.example

post-extract:
	@${LN} -sf ${WRKSRC}/uulib/uudeview.h ${WRKSRC}/uudeview.h

post-patch:
	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e '187s/int/intptr_t/' ${WRKSRC}/ArticleDownloader.cpp

post-install:
	@${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${PREFIX}/etc

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (nzbget-0.2.3.tar.gz) = 25554537c7641bd36f573a5f7c89b449	1	MD5 (nzbget-0.3.1.tar.gz) = 20c4b3ec0cf2da7fa48dcb985d7a82b7
2	SHA256 (nzbget-0.2.3.tar.gz) = 9bedeb890f7ef49d466f95d76ffea1d4d22788d6dc760c96c6433bff3ff1f6b6	2	SHA256 (nzbget-0.3.1.tar.gz) = 1baacc427e9bacf6b2dcfa50f283a9f62b2f467ac70ab6bd4d80e9d20e8e1bbb
3	SIZE (nzbget-0.2.3.tar.gz) = 202660	3	SIZE (nzbget-0.3.1.tar.gz) = 222351

Removed Link Here

(-)files/patch-Connection.cpp (-11 lines)
1	--- Connection.cpp.orig Fri Apr 2 18:55:19 2004
2	+++ Connection.cpp Sat Apr 17 23:12:22 2004
3	@@ -27,6 +27,8 @@
4	#include <config.h>
5	#endif
6
7	+#include <sys/types.h>
8	+
9	#include <string.h>
10	#include <stdlib.h>
11	#include <netdb.h>

Removed Link Here

(-)files/patch-Coordinator.cpp (-10 lines)
1	--- Coordinator.cpp~ Wed Feb 23 09:05:23 2005
2	+++ Coordinator.cpp Fri Apr 15 15:41:42 2005
3	@@ -28,6 +28,7 @@
4	#endif
5
6	#include <unistd.h>
7	+#include <libgen.h>
8
9	#include "global.h"
10	#include "Coordinator.h"

Removed Link Here

(-)files/patch-Decoder.cpp (-11 lines)
1	--- Decoder.cpp.orig Wed Feb 25 13:46:10 2004
2	+++ Decoder.cpp Sat Apr 17 23:14:45 2004
3	@@ -29,6 +29,8 @@
4
5	#define PROTOTYPES
6
7	+#include <unistd.h>
8	+
9	#include <stdlib.h>
10	#include <stdio.h>
11	#include <uudeview.h>




--- Makefile.in.orig	Sun Feb 27 12:59:05 2005
+++ Makefile.in	Fri Apr 15 16:31:02 2005
@@ -19,8 +19,8 @@
 CP		= @CP@
 CFLAGS		= @CFLAGS@ 
 DEFS		= @DEFS@ -DVERSION=\"$(VERSION)\"
-CPPFLAGS	= -I./uulib @CPPFLAGS@
-LDFLAGS		= -L./uulib @LDFLAGS@
+CPPFLAGS	= @CPPFLAGS@
+LDFLAGS		= @LDFLAGS@
 LIBS		= -luu -lncurses @LIBS@
 INSTALL		= @INSTALL@
 
@@ -94,19 +94,14 @@
 
 # Executable programmes
 #
-nzbget: $(OBJECTS) nzbget.o ./uulib/libuu.a
+nzbget: $(OBJECTS) nzbget.o
 	$(CXX) $(CFLAGS) -o $@ $(OBJECTS) nzbget.o $(LDFLAGS) $(LIBS)
 	@echo "Build succeeded."
 
-./uulib/libuu.a:
-	make -C uulib
-
 clean:
-	-cd ./uulib && make clean && cd ..
 	-$(RM) -f *.o $(PROGRAMS) .depend libuu.a
 
 distclean: clean
-	-cd ./uulib && make distclean && cd ..
 	-$(RM) -f Makefile config.status config.log config.h .depend
 
 
@@ -123,17 +118,15 @@
 
 distrib:
 	$(MKDIR) nzbget-$(VERSION)
-	$(MKDIR) nzbget-$(VERSION)/uulib
 	$(CP) -av $(DISTFILES) nzbget-$(VERSION)
-	$(CP) -av $(UUDISTFILES) nzbget-$(VERSION)/uulib
 	cd nzbget-$(VERSION) && ./configure
-	cd nzbget-$(VERSION) && make
-	cd nzbget-$(VERSION) && make distclean
+	cd nzbget-$(VERSION) && ${MAKE}
+	cd nzbget-$(VERSION) && ${MAKE} distclean
 	tar -czf nzbget-$(VERSION).tar.gz nzbget-$(VERSION)
 	$(RM) -r nzbget-$(VERSION)
 
 install: nzbget
-	$(INSTALL) nzbget /usr/bin/nzbget
+	$(INSTALL) nzbget ${PREFIX}/bin/nzbget
 
 
 -include .depend




--- NCursesFrontend.cpp~	Wed Feb 23 09:05:23 2005
+++ NCursesFrontend.cpp	Fri Apr 15 15:43:27 2005
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <signal.h>
+#include <libgen.h>
 
 #include "NCursesFrontend.h"
 
@@ -342,7 +343,7 @@
 					  NCURSES_COLORPAIR_DEBUG};
 
 	NCOLORON( iMessageTypeColor[Msg.m_eType] );
-	mvprintw( iRow, 0, szMessageType[ Msg.m_eType ] );
+	mvprintw( iRow, 0, (char *)szMessageType[ Msg.m_eType ] );
 	NCOLOROFF( iMessageTypeColor[Msg.m_eType] );
 
 	char szBuffer[512];

Removed Link Here

(-)files/patch-NNTPConnection.h (-10 lines)
1	--- NNTPConnection.h.orig Fri Apr 2 18:55:19 2004
2	+++ NNTPConnection.h Sat Apr 17 22:53:55 2004
3	@@ -26,6 +26,7 @@
4	#ifndef NNTPCONNECTION_H
5	#define NNTPCONNECTION_H
6
7	+#include <sys/types.h>
8	#include <sys/socket.h>
9	#include <stdio.h>
10	#include <vector>

Removed Link Here

(-)files/patch-NZBQueue.cpp (-10 lines)
1	--- NZBQueue.cpp~ Wed Feb 23 09:05:23 2005
2	+++ NZBQueue.cpp Fri Apr 15 15:40:41 2005
3	@@ -26,6 +26,7 @@
4	#ifdef HAVE_CONFIG_H
5	#include <config.h>
6	#endif
7	+#include <libgen.h>
8
9	#include "NZBQueue.h"
10	#include "global.h"




--- configure.old	2008-02-29 12:18:26.000000000 -0300
+++ configure	2008-02-29 12:20:35.000000000 -0300
@@ -2362,7 +2362,10 @@
     CPPFLAGS1="${CPPFLAGS} -D_GNU_SOURCE"
     PLATFORM="Linux"
     ;;
   *-freebsd*)
-    LIBPREF1="/usr/local"
+    LIBPREF1="${LOCALBASE}"
+    CFLAGS="${CFLAGS}"
+    CPPFLAGS="${CPPFLAGS}"
+    PLATFORM="FreeBSD"
+    ;;
+   *-solaris*)
     LIBPREF="/usr/local"
     PLATFORM="SunOS"
     ;;
   *-solaris*)
     LIBPREF1="/usr"
-CFLAGS="-Wall -g -O0 -pipe" CPPFLAGS="-I. ${CPPFLAGS}"
+CFLAGS="${CFLAGS} -Wall" CPPFLAGS="-I. ${CPPFLAGS}"
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

Return to bug 121225

Lines 6-12 Link Here

(-)Makefile (-10 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= nzbget	8	PORTNAME= nzbget
9	PORTVERSION= 0.2.3	9	PORTVERSION= 0.3.1
10	CATEGORIES= news	10	CATEGORIES= news
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
Lines 17-37 Link Here
17	uu.3:${PORTSDIR}/converters/uulib	17	uu.3:${PORTSDIR}/converters/uulib
18		18
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	CONFIGURE_ARGS= --disable-parcheck
20	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \	21	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
21	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \	22	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
22	LOCALBASE="${LOCALBASE}"	23	LOCALBASE="${LOCALBASE}"
23	USE_GMAKE= yes	24	USE_GMAKE= yes
24		25
25	PLIST_FILES= bin/nzbget etc/nzbget.cfg.example	26	PLIST_FILES= bin/nzbget etc/nzbget.conf.example
26
27	post-extract:
28	@${LN} -sf ${WRKSRC}/uulib/uudeview.h ${WRKSRC}/uudeview.h
29
30	post-patch:
31	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
32	@${REINPLACE_CMD} -e '187s/int/intptr_t/' ${WRKSRC}/ArticleDownloader.cpp
33		27
34	post-install:	28	post-install:
35	${INSTALL_DATA} ${WRKSRC}/nzbget.cfg.example ${PREFIX}/etc	29	@${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${PREFIX}/etc
36		30
37	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Removed Link Here

(-)files/patch-Makefile.in (-55 lines)
1	--- Makefile.in.orig Sun Feb 27 12:59:05 2005
2	+++ Makefile.in Fri Apr 15 16:31:02 2005
3	@@ -19,8 +19,8 @@
4	CP = @CP@
5	CFLAGS = @CFLAGS@
6	DEFS = @DEFS@ -DVERSION=\"$(VERSION)\"
7	-CPPFLAGS = -I./uulib @CPPFLAGS@
8	-LDFLAGS = -L./uulib @LDFLAGS@
9	+CPPFLAGS = @CPPFLAGS@
10	+LDFLAGS = @LDFLAGS@
11	LIBS = -luu -lncurses @LIBS@
12	INSTALL = @INSTALL@
13
14	@@ -94,19 +94,14 @@
15
16	# Executable programmes
17	#
18	-nzbget: $(OBJECTS) nzbget.o ./uulib/libuu.a
19	+nzbget: $(OBJECTS) nzbget.o
20	$(CXX) $(CFLAGS) -o $@ $(OBJECTS) nzbget.o $(LDFLAGS) $(LIBS)
21	@echo "Build succeeded."
22
23	-./uulib/libuu.a:
24	- make -C uulib
25	-
26	clean:
27	- -cd ./uulib && make clean && cd ..
28	-$(RM) -f *.o $(PROGRAMS) .depend libuu.a
29
30	distclean: clean
31	- -cd ./uulib && make distclean && cd ..
32	-$(RM) -f Makefile config.status config.log config.h .depend
33
34
35	@@ -123,17 +118,15 @@
36
37	distrib:
38	$(MKDIR) nzbget-$(VERSION)
39	- $(MKDIR) nzbget-$(VERSION)/uulib
40	$(CP) -av $(DISTFILES) nzbget-$(VERSION)
41	- $(CP) -av $(UUDISTFILES) nzbget-$(VERSION)/uulib
42	cd nzbget-$(VERSION) && ./configure
43	- cd nzbget-$(VERSION) && make
44	- cd nzbget-$(VERSION) && make distclean
45	+ cd nzbget-$(VERSION) && ${MAKE}
46	+ cd nzbget-$(VERSION) && ${MAKE} distclean
47	tar -czf nzbget-$(VERSION).tar.gz nzbget-$(VERSION)
48	$(RM) -r nzbget-$(VERSION)
49
50	install: nzbget
51	- $(INSTALL) nzbget /usr/bin/nzbget
52	+ $(INSTALL) nzbget ${PREFIX}/bin/nzbget
53
54
55	-include .depend

Removed Link Here

(-)files/patch-NCursesFrontend.cpp (-19 lines)
1	--- NCursesFrontend.cpp~ Wed Feb 23 09:05:23 2005
2	+++ NCursesFrontend.cpp Fri Apr 15 15:43:27 2005
3	@@ -27,6 +27,7 @@
4	#include <unistd.h>
5	#include <stdarg.h>
6	#include <signal.h>
7	+#include <libgen.h>
8
9	#include "NCursesFrontend.h"
10
11	@@ -342,7 +343,7 @@
12	NCURSES_COLORPAIR_DEBUG};
13
14	NCOLORON( iMessageTypeColor[Msg.m_eType] );
15	- mvprintw( iRow, 0, szMessageType[ Msg.m_eType ] );
16	+ mvprintw( iRow, 0, (char *)szMessageType[ Msg.m_eType ] );
17	NCOLOROFF( iMessageTypeColor[Msg.m_eType] );
18
19	char szBuffer[512];

Lines 1-24 Link Here

(-)files/patch-configure (-19 / +9 lines)
1	--- configure.orig Thu Feb 26 15:49:46 2004	1	--- configure.old 2008-02-29 12:18:26.000000000 -0300
2	+++ configure Tue Apr 13 22:55:38 2004	2	+++ configure 2008-02-29 12:20:35.000000000 -0300
3	@@ -1303,13 +1303,19 @@	3	@@ -2362,7 +2362,10 @@
4	CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"	4	CPPFLAGS1="${CPPFLAGS} -D_GNU_SOURCE"
5	PLATFORM="Linux"
6	;;	5	;;
7	- -solaris)	6	-freebsd)
8	+ -freebsd)	7	- LIBPREF1="/usr/local"
9	+ LIBPREF="${LOCALBASE}"	8	+ LIBPREF1="${LOCALBASE}"
10	+ CFLAGS="${CFLAGS}"	9	+ CFLAGS="${CFLAGS}"
11	+ CPPFLAGS="${CPPFLAGS}"	10	+ CPPFLAGS="${CPPFLAGS}"
12	+ PLATFORM="FreeBSD"	11	+ PLATFORM="FreeBSD"
13	+ ;;
14	+ -solaris)
15	LIBPREF="/usr/local"
16	PLATFORM="SunOS"
17	;;	12	;;
18	esac	13	-solaris)
19		14	LIBPREF1="/usr"
20	-CFLAGS="-Wall -g -O0 -pipe" CPPFLAGS="-I. ${CPPFLAGS}"
21	+CFLAGS="${CFLAGS} -Wall" CPPFLAGS="-I. ${CPPFLAGS}"
22
23	ac_ext=cc
24	ac_cpp='$CXXCPP $CPPFLAGS'