Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Aug 2008 21:08:50 +0200 (CEST)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        shaun@FreeBSD.org
Subject:   ports/126923: news/slrn: upgrade to 0.9.9.
Message-ID:  <20080828190850.AD120114BF@graf.pompo.net>
Resent-Message-ID: <200808281940.m7SJe0Tf027571@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         126923
>Category:       ports
>Synopsis:       news/slrn: upgrade to 0.9.9.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 28 19:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 7.0-STABLE FreeBSD 7.0-STABLE #1: Sun Aug 24 00:19:16 CEST 2008 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF071102 i386


	
>Description:
	Upgrade slrn to the latest.

	Changelog at <http://slrn.sourceforge.net/docs/changes.txt>.

>How-To-Repeat:
	N/A

>Fix:
	Please apply the following patch:

--- slrn.diff begins here ---
diff -urN news/slrn.orig/Makefile news/slrn/Makefile
--- news/slrn.orig/Makefile	2008-06-07 11:46:02.000000000 +0200
+++ news/slrn/Makefile	2008-08-27 21:10:20.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	slrn
-PORTVERSION=	0.9.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://angel.sovam.com/pub/tools/net/news/ \
@@ -16,17 +15,11 @@
 		ftp://ftp.plig.org/pub/slrn/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	http://slrn.sourceforge.net/patches/
-PATCHFILES=	slrn-0.9.8.1-fetch.diff \
-		slrn-0.9.8.1-lastchar2.diff
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 
@@ -61,10 +54,8 @@
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
-		${WRKSRC}/src/slrnfeat.h
-	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
-		${WRKSRC}/src/jdmacros.h
+pre-configure:
+	${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
+		${WRKSRC}/src/slrnfeat.hin
 
 .include <bsd.port.mk>
diff -urN news/slrn.orig/distinfo news/slrn/distinfo
--- news/slrn.orig/distinfo	2006-01-31 20:51:19.000000000 +0100
+++ news/slrn/distinfo	2008-08-27 19:43:12.000000000 +0200
@@ -1,9 +1,3 @@
-MD5 (slrn-0.9.8.1.tar.bz2) = 9b613007df537444a5f8a4a2994fadb7
-SHA256 (slrn-0.9.8.1.tar.bz2) = 46968e442ece567b7928faefa0774f675761b474be80e9487235c20f50a9fd05
-SIZE (slrn-0.9.8.1.tar.bz2) = 1034332
-MD5 (slrn-0.9.8.1-fetch.diff) = 969471685aa7412bc60869649312618f
-SHA256 (slrn-0.9.8.1-fetch.diff) = 0ae228075f15977f0d063cd60ef89be3c984692eed75ea7aa3ebb3bb59d7e243
-SIZE (slrn-0.9.8.1-fetch.diff) = 920
-MD5 (slrn-0.9.8.1-lastchar2.diff) = 01717350eabdcda662ff2444d8b3e560
-SHA256 (slrn-0.9.8.1-lastchar2.diff) = 940e6a10cfb2ee97a6d0ae1b7af8d0744a40fd627db86bf44e8e1a9f2f20f3b8
-SIZE (slrn-0.9.8.1-lastchar2.diff) = 4732
+MD5 (slrn-0.9.9.tar.gz) = 87c0172887bf6e020759bf6241c003fc
+SHA256 (slrn-0.9.9.tar.gz) = fea654bdd7f9577dc4f50cc69b8928b3e5b283652bd022ec5265a4da88d944a4
+SIZE (slrn-0.9.9.tar.gz) = 1532550
diff -urN news/slrn.orig/files/patch-Makefile.in news/slrn/files/patch-Makefile.in
--- news/slrn.orig/files/patch-Makefile.in	2004-11-07 17:45:51.000000000 +0100
+++ news/slrn/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
---- Makefile.in.orig	Thu Oct  7 00:30:27 2004
-+++ Makefile.in	Fri Nov  5 21:57:51 2004
-@@ -243,6 +243,7 @@
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- uninstall-info-am:
- install-docDATA: $(doc_DATA)
-+ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
- 	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -251,6 +252,7 @@
- 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- 	done
-+endif
- 
- uninstall-docDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -524,9 +526,11 @@
- all-am: Makefile $(DATA) all-local
- installdirs: installdirs-recursive
- installdirs-am:
-+ifndef NOPORTDOCS
- 	for dir in "$(DESTDIR)$(docdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
-+endif
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
diff -urN news/slrn.orig/files/patch-doc::Makefile.in news/slrn/files/patch-doc::Makefile.in
--- news/slrn.orig/files/patch-doc::Makefile.in	2004-11-07 17:45:51.000000000 +0100
+++ news/slrn/files/patch-doc::Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
---- doc/Makefile.in.orig	Thu Oct  7 00:30:28 2004
-+++ doc/Makefile.in	Fri Nov  5 21:40:07 2004
-@@ -268,6 +268,7 @@
- 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- install-docDATA: $(doc_DATA)
-+ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
- 	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -276,6 +277,7 @@
- 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- 	done
-+endif
- 
- uninstall-docDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -447,9 +449,11 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-+ifndef NOPORTDOCS
- 	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
-+endif
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -542,6 +546,7 @@
- 
- 
- install-data-local:
-+ifndef NOPORTDOCS
- 	@if test "x$(SLRNPULL)" = "xslrnpull"; then \
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)/slrnpull; \
- 	list='$(PULLDOCS)'; for p in $$list; do \
-@@ -551,6 +556,7 @@
- 	  fi; \
- 	done; \
- 	fi;
-+endif
- 
- uninstall-local:
- 	list='$(PULLDOCS)'; for p in $$list; do \
diff -urN news/slrn.orig/files/patch-src_Makefile.in news/slrn/files/patch-src_Makefile.in
--- news/slrn.orig/files/patch-src_Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ news/slrn/files/patch-src_Makefile.in	2008-08-27 19:53:47.000000000 +0200
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig	2008-08-09 18:36:02.000000000 +0200
++++ src/Makefile.in	2008-08-27 19:52:48.000000000 +0200
+@@ -160,6 +160,7 @@
+ 		  exit 1; \
+ 		fi; \
+ 	done
++ifndef NOPORTDOCS
+ 	@for i in $(UP_DOC_FILES); \
+ 	do \
+ 		echo $(INSTALL_DATA) ../$$i $(DEST_DOCDIR); \
+@@ -184,6 +185,8 @@
+ 		  exit 1; \
+ 		fi; \
+ 	done
++endif
++
+ installslang:
+ 	@for i in $(CONF_FILES); \
+ 	do \
diff -urN news/slrn.orig/pkg-plist news/slrn/pkg-plist
--- news/slrn.orig/pkg-plist	2006-05-06 07:43:05.000000000 +0200
+++ news/slrn/pkg-plist	2008-08-28 20:44:56.000000000 +0200
@@ -39,21 +39,22 @@
 %%NLS%%share/locale/ru/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/slrn.mo
-%%DATADIR%%/macros/color.sl
-%%DATADIR%%/macros/gsort.sl
-%%DATADIR%%/macros/ispell.sl
-%%DATADIR%%/macros/latin2.sl
-%%DATADIR%%/macros/multipart.sl
-%%DATADIR%%/macros/nn.sl
-%%DATADIR%%/macros/posthook.sl
-%%DATADIR%%/macros/search.sl
-%%DATADIR%%/macros/tin-art.sl
-%%DATADIR%%/macros/tin-group.sl
-%%DATADIR%%/macros/ttyprint.sl
-%%DATADIR%%/macros/util.sl
-%%DATADIR%%/macros/varset.sl
-%%DATADIR%%/macros/xcomment.sl
-@dirrm %%DATADIR%%/macros
+%%DATADIR%%/slang/color.sl
+%%DATADIR%%/slang/gsort.sl
+%%DATADIR%%/slang/ispell.sl
+%%DATADIR%%/slang/latin2.sl
+%%DATADIR%%/slang/multipart.sl
+%%DATADIR%%/slang/nn.sl
+%%DATADIR%%/slang/posthook.sl
+%%DATADIR%%/slang/search.sl
+%%DATADIR%%/slang/slrn.sl
+%%DATADIR%%/slang/tin-art.sl
+%%DATADIR%%/slang/tin-group.sl
+%%DATADIR%%/slang/ttyprint.sl
+%%DATADIR%%/slang/util.sl
+%%DATADIR%%/slang/varset.sl
+%%DATADIR%%/slang/xcomment.sl
+@dirrm %%DATADIR%%/slang
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/slrnpull
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- slrn.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080828190850.AD120114BF>