From 12273806d638cab41ba5e104d1a76ce6da767c87 Mon Sep 17 00:00:00 2001 From: Felippe de Meirelles Motta Date: Wed, 19 Mar 2008 12:38:00 +0000 Subject: [PATCH] - Update to 0.3.1. - Fix pkg-plist. - Makefile cleanup. - Remove unnecessary patches. - Use CONFIGURE_ARGS to disable use of libpar2 (not present in ports). PR: ports/121225 Submitted by: myself Approved by: gabor (mentor), maintainer timeout (> 2 weeks) --- news/nzbget/Makefile | 14 ++---- news/nzbget/distinfo | 6 +-- news/nzbget/files/patch-Connection.cpp | 11 ----- news/nzbget/files/patch-Coordinator.cpp | 10 ---- news/nzbget/files/patch-Decoder.cpp | 11 ----- news/nzbget/files/patch-Makefile.in | 55 --------------------- news/nzbget/files/patch-NCursesFrontend.cpp | 19 ------- news/nzbget/files/patch-NNTPConnection.h | 10 ---- news/nzbget/files/patch-NZBQueue.cpp | 10 ---- news/nzbget/files/patch-configure | 28 ++++------- 10 files changed, 16 insertions(+), 158 deletions(-) delete mode 100644 news/nzbget/files/patch-Connection.cpp delete mode 100644 news/nzbget/files/patch-Coordinator.cpp delete mode 100644 news/nzbget/files/patch-Decoder.cpp delete mode 100644 news/nzbget/files/patch-Makefile.in delete mode 100644 news/nzbget/files/patch-NCursesFrontend.cpp delete mode 100644 news/nzbget/files/patch-NNTPConnection.h delete mode 100644 news/nzbget/files/patch-NZBQueue.cpp diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile index ccac741ddef9..61535592e72e 100644 --- a/news/nzbget/Makefile +++ b/news/nzbget/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nzbget -PORTVERSION= 0.2.3 +PORTVERSION= 0.3.1 CATEGORIES= news MASTER_SITES= SF @@ -17,21 +17,15 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ 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.cfg.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 +PLIST_FILES= bin/nzbget etc/nzbget.conf.example post-install: - ${INSTALL_DATA} ${WRKSRC}/nzbget.cfg.example ${PREFIX}/etc + @${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${PREFIX}/etc .include diff --git a/news/nzbget/distinfo b/news/nzbget/distinfo index 0d667b7d07b1..3aa9d2540fa3 100644 --- a/news/nzbget/distinfo +++ b/news/nzbget/distinfo @@ -1,3 +1,3 @@ -MD5 (nzbget-0.2.3.tar.gz) = 25554537c7641bd36f573a5f7c89b449 -SHA256 (nzbget-0.2.3.tar.gz) = 9bedeb890f7ef49d466f95d76ffea1d4d22788d6dc760c96c6433bff3ff1f6b6 -SIZE (nzbget-0.2.3.tar.gz) = 202660 +MD5 (nzbget-0.3.1.tar.gz) = 20c4b3ec0cf2da7fa48dcb985d7a82b7 +SHA256 (nzbget-0.3.1.tar.gz) = 1baacc427e9bacf6b2dcfa50f283a9f62b2f467ac70ab6bd4d80e9d20e8e1bbb +SIZE (nzbget-0.3.1.tar.gz) = 222351 diff --git a/news/nzbget/files/patch-Connection.cpp b/news/nzbget/files/patch-Connection.cpp deleted file mode 100644 index 6a30dca06302..000000000000 --- a/news/nzbget/files/patch-Connection.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Connection.cpp.orig Fri Apr 2 18:55:19 2004 -+++ Connection.cpp Sat Apr 17 23:12:22 2004 -@@ -27,6 +27,8 @@ - #include - #endif - -+#include -+ - #include - #include - #include diff --git a/news/nzbget/files/patch-Coordinator.cpp b/news/nzbget/files/patch-Coordinator.cpp deleted file mode 100644 index 05cd3edede38..000000000000 --- a/news/nzbget/files/patch-Coordinator.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- Coordinator.cpp~ Wed Feb 23 09:05:23 2005 -+++ Coordinator.cpp Fri Apr 15 15:41:42 2005 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "global.h" - #include "Coordinator.h" diff --git a/news/nzbget/files/patch-Decoder.cpp b/news/nzbget/files/patch-Decoder.cpp deleted file mode 100644 index 8a12e23c26b3..000000000000 --- a/news/nzbget/files/patch-Decoder.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Decoder.cpp.orig Wed Feb 25 13:46:10 2004 -+++ Decoder.cpp Sat Apr 17 23:14:45 2004 -@@ -29,6 +29,8 @@ - - #define PROTOTYPES - -+#include -+ - #include - #include - #include diff --git a/news/nzbget/files/patch-Makefile.in b/news/nzbget/files/patch-Makefile.in deleted file mode 100644 index 23b8da2b509a..000000000000 --- a/news/nzbget/files/patch-Makefile.in +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 diff --git a/news/nzbget/files/patch-NCursesFrontend.cpp b/news/nzbget/files/patch-NCursesFrontend.cpp deleted file mode 100644 index 6e8cbb8fff6b..000000000000 --- a/news/nzbget/files/patch-NCursesFrontend.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- NCursesFrontend.cpp~ Wed Feb 23 09:05:23 2005 -+++ NCursesFrontend.cpp Fri Apr 15 15:43:27 2005 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #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]; diff --git a/news/nzbget/files/patch-NNTPConnection.h b/news/nzbget/files/patch-NNTPConnection.h deleted file mode 100644 index b4337ec4fa89..000000000000 --- a/news/nzbget/files/patch-NNTPConnection.h +++ /dev/null @@ -1,10 +0,0 @@ ---- NNTPConnection.h.orig Fri Apr 2 18:55:19 2004 -+++ NNTPConnection.h Sat Apr 17 22:53:55 2004 -@@ -26,6 +26,7 @@ - #ifndef NNTPCONNECTION_H - #define NNTPCONNECTION_H - -+#include - #include - #include - #include diff --git a/news/nzbget/files/patch-NZBQueue.cpp b/news/nzbget/files/patch-NZBQueue.cpp deleted file mode 100644 index 6a6aeb30a98d..000000000000 --- a/news/nzbget/files/patch-NZBQueue.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- NZBQueue.cpp~ Wed Feb 23 09:05:23 2005 -+++ NZBQueue.cpp Fri Apr 15 15:40:41 2005 -@@ -26,6 +26,7 @@ - #ifdef HAVE_CONFIG_H - #include - #endif -+#include - - #include "NZBQueue.h" - #include "global.h" diff --git a/news/nzbget/files/patch-configure b/news/nzbget/files/patch-configure index 1b7b99f44f33..94929759b9d5 100644 --- a/news/nzbget/files/patch-configure +++ b/news/nzbget/files/patch-configure @@ -1,24 +1,14 @@ ---- configure.orig Thu Feb 26 15:49:46 2004 -+++ configure Tue Apr 13 22:55:38 2004 -@@ -1303,13 +1303,19 @@ - CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" - PLATFORM="Linux" +--- 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" ;; -- *-solaris*) -+ *-freebsd*) -+ LIBPREF="${LOCALBASE}" + *-freebsd*) +- LIBPREF1="/usr/local" ++ LIBPREF1="${LOCALBASE}" + CFLAGS="${CFLAGS}" + CPPFLAGS="${CPPFLAGS}" + PLATFORM="FreeBSD" -+ ;; -+ *-solaris*) - LIBPREF="/usr/local" - PLATFORM="SunOS" ;; - esac - --CFLAGS="-Wall -g -O0 -pipe" CPPFLAGS="-I. ${CPPFLAGS}" -+CFLAGS="${CFLAGS} -Wall" CPPFLAGS="-I. ${CPPFLAGS}" - - ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' + *-solaris*) + LIBPREF1="/usr"