ports/171926: [maintainer] lang/chicken: update to 4.8.0

[Vitaly Magerya]

>Number:         171926
>Category:       ports
>Synopsis:       [maintainer] lang/chicken: update to 4.8.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 24 19:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Vitaly Magerya
>Release:        
>Organization:
>Environment:
>Description:
Update lang/chicken from 4.7.0 to 4.8.0.
Also make NOPORTDOCS work.

Tested on redports [1].

[1] https://redports.org/buildarchive/20120924172733-58763/
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN chicken.orig/Makefile chicken/Makefile
--- chicken.orig/Makefile	2012-09-24 20:28:26.000000000 +0300
+++ chicken/Makefile	2012-09-24 20:25:49.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	chicken
-PORTVERSION=	4.7.0
+PORTVERSION=	4.8.0
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://code.call-cc.org/releases/${PORTVERSION}/
 
@@ -23,6 +23,7 @@
 		C_COMPILER="${CC}" \
 		CXX_COMPILER="${CXX}" \
 		LIBRARIAN="${AR}" \
+		DOCDIR="${DOCSDIR}" \
 		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}"
 
 NEW_ARCH=	${ARCH:S/i386/x86/:S/amd64/x86-64/}
@@ -37,14 +38,17 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} '/^%.so:/s|$$| lib$$(PROGRAM_PREFIX)chicken$$(PROGRAM_SUFFIX)$$(SO)|' \
-		${WRKSRC}/rules.make
-	@${REINPLACE_CMD} \
-		's|^DOCDIR = .*$$|DOCDIR = ${DOCSDIR}|' \
-		${WRKSRC}/defaults.make
+.ifdef NOPORTDOCS
+	${REINPLACE_CMD} '/DESTDIR.*manual/d' ${WRKSRC}/rules.make
+.endif
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
+# This only works *after* chicken is installed.
+regression-test: build
+	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+
 .include <bsd.port.post.mk>
diff -ruN chicken.orig/distinfo chicken/distinfo
--- chicken.orig/distinfo	2012-09-24 20:28:26.000000000 +0300
+++ chicken/distinfo	2012-09-24 20:09:16.000000000 +0300
@@ -1,2 +1,2 @@
-SHA256 (chicken-4.7.0.tar.gz) = 56afdbff812febe3f98ae437716ecaa96115732f21db5063ce413e4c7449a26c
-SIZE (chicken-4.7.0.tar.gz) = 3392031
+SHA256 (chicken-4.8.0.tar.gz) = 5b2e8c6b4b13b502d8c684b394d80ed490d2884c03789353d895ab85d19979ab
+SIZE (chicken-4.8.0.tar.gz) = 3970818
diff -ruN chicken.orig/files/patch-rules-make chicken/files/patch-rules-make
--- chicken.orig/files/patch-rules-make	1970-01-01 03:00:00.000000000 +0300
+++ chicken/files/patch-rules-make	2012-09-24 20:06:39.000000000 +0300
@@ -0,0 +1,13 @@
+--- rules.make.orig	2012-07-07 11:34:54.000000000 +0300
++++ rules.make	2012-07-07 11:38:18.000000000 +0300
+@@ -242,8 +242,8 @@
+ 
+ # import libraries and extensions
+ 
+-%.so: %.o
+-	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(LINKER_OUTPUT_OPTION) $@ \
++%.so: %.o $(PRIMARY_LIBCHICKEN)
++	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $< $(LINKER_OUTPUT_OPTION) $@ \
+ 	  $(LINKER_LIBRARY_PREFIX)$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(LINKER_LIBRARY_SUFFIX) \
+ 	  $(LIBRARIES)
+ 
diff -ruN chicken.orig/pkg-plist chicken/pkg-plist
--- chicken.orig/pkg-plist	2012-09-24 20:28:26.000000000 +0300
+++ chicken/pkg-plist	2012-09-24 20:17:47.000000000 +0300
@@ -19,7 +19,6 @@
 lib/chicken/6/modules.db
 lib/chicken/6/ports.import.so
 lib/chicken/6/posix.import.so
-lib/chicken/6/scheme.import.so
 lib/chicken/6/setup-api.import.so
 lib/chicken/6/setup-api.so
 lib/chicken/6/setup-download.import.so
@@ -88,8 +87,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/manual/Unit tcp.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Unit utils.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Using the compiler.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Using the interpreter.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/chicken.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/Using the interpreter.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/manual.css


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