ports/118901: [PATCH] devel/cook: update to 2.30 and clean up

Thu Dec 20 20:30:01 UTC 2007

>Number:         118901
>Category:       ports
>Synopsis:       [PATCH] devel/cook: update to 2.30 and clean up
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 20 20:30:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alejandro Pulver
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007
    root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP



>Description:


- Update to version 2.30.
- Use ARCH instead of MACHINE_ARCH.
- Remove NOMANCOMPRESSED=no (that's the default value).
- Install documentation in DOCSDIR, only if !NOPORTDOCS.
- Add WWW line to pkg-descr.
- Avoid duplicating manual pages in DATADIR before installation.
- Remove internal .datadir/.libdir files after installation. The application uses these to avoid recreating directories on next install.


>How-To-Repeat:





>Fix:

--- cook.diff begins here ---
Index: cook/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/cook/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- cook/Makefile	23 Jul 2007 09:35:38 -0000	1.35
+++ cook/Makefile	20 Dec 2007 07:19:17 -0000
@@ -6,34 +6,29 @@
 #
 
 PORTNAME=	cook
-PORTVERSION=	2.28
+PORTVERSION=	2.30
 CATEGORIES=	devel
-MASTER_SITES=	http://gd.tuwien.ac.at/softeng/Aegis/cook/ \
-		http://miller.emu.id.au/pmiller/software/cook/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=jasone
+MASTER_SITES=	http://miller.emu.id.au/pmiller/software/cook/
 
 MAINTAINER=	jasone at FreeBSD.org
 COMMENT=	Like make(1), but more powerful and clean
 
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
 		YACC=yacc
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \
 	find_libs.1 make2cook.1 roffpp.1
-MANCOMPRESSED=	no
-USE_GETTEXT=	yes
-
-# Make sure that the whole directory tree exists.
-pre-install:
-	${MKDIR} ${PREFIX}/share/cook/en/man1
-	${MKDIR} ${PREFIX}/lib/cook/en/LC_MESSAGES
 
-# cook installs extra copies of the manpages in a directory that MANLANG can't
-# cope with.  Delete the extra copies.
 post-install:
-	@${RM} -rf ${PREFIX}/share/cook/en/man1
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/en
+	cd ${WRKSRC}/lib/en && ${INSTALL_DATA} *.dvi *.ps *.txt ${DOCSDIR}/en
+.endif
+# Fails to reinstall because keeps track of created directories, so make it
+# forget that, so recreating them on each install.
+	@${FIND} ${WRKSRC} -type f -name ".*dir" -delete
 
 .include <bsd.port.mk>
Index: cook/distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/cook/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- cook/distinfo	12 Jun 2007 16:22:03 -0000	1.14
+++ cook/distinfo	20 Dec 2007 07:19:17 -0000
@@ -1,3 +1,3 @@
-MD5 (cook-2.28.tar.gz) = 7a848e5bce7b19dd0be5a1793cedc2fa
-SHA256 (cook-2.28.tar.gz) = e4318cf8e8c22a89104a005575190f87820cc849d0cb0a1f1e761aed443174cb
-SIZE (cook-2.28.tar.gz) = 912208
+MD5 (cook-2.30.tar.gz) = 04b535e9905152d35080a2cb445c5988
+SHA256 (cook-2.30.tar.gz) = 3c9943477c335816846e495ec2b7bbf153c18c4f41c26a7996ab9ee46cc7d4a8
+SIZE (cook-2.30.tar.gz) = 904184
Index: cook/pkg-descr
===================================================================
RCS file: /home/pcvs/ports/devel/cook/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- cook/pkg-descr	1 Feb 2000 07:41:58 -0000	1.1
+++ cook/pkg-descr	20 Dec 2007 07:19:17 -0000
@@ -4,3 +4,5 @@
 ideal world).  Don't be put off by 'cook' not being commonly available on
 target machines, since 'cook' can automatically generate shell scripts that
 make installing 'cook' on target machines unnecessary.
+
+WWW:	http://miller.emu.id.au/pmiller/software/cook/
Index: cook/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/cook/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- cook/pkg-plist	18 Jan 2006 03:21:02 -0000	1.7
+++ cook/pkg-plist	20 Dec 2007 07:19:17 -0000
@@ -17,40 +17,41 @@
 lib/cook/en/LC_MESSAGES/find_libs.mo
 lib/cook/en/LC_MESSAGES/make2cook.mo
 lib/cook/en/LC_MESSAGES/roffpp.mo
-share/cook/as
-share/cook/bison
-share/cook/c
-share/cook/c++
-share/cook/en/refman.dvi
-share/cook/en/refman.ps
-share/cook/en/refman.txt
-share/cook/en/tutorial.dvi
-share/cook/en/tutorial.ps
-share/cook/en/tutorial.txt
-share/cook/en/user-guide.dvi
-share/cook/en/user-guide.ps
-share/cook/en/user-guide.txt
-share/cook/f77
-share/cook/functions
-share/cook/g77
-share/cook/gcc
-share/cook/home
-share/cook/host_lists.pl
-share/cook/java
-share/cook/lex
-share/cook/library
-share/cook/print
-share/cook/program
-share/cook/rcs
-share/cook/recursive
-share/cook/sccs
-share/cook/text
-share/cook/usr
-share/cook/usr.local
-share/cook/yacc
-share/cook/yacc_many
+%%DATADIR%%/as
+%%DATADIR%%/bison
+%%DATADIR%%/c
+%%DATADIR%%/c++
+%%DATADIR%%/f77
+%%DATADIR%%/functions
+%%DATADIR%%/g77
+%%DATADIR%%/gcc
+%%DATADIR%%/home
+%%DATADIR%%/host_lists.pl
+%%DATADIR%%/java
+%%DATADIR%%/lex
+%%DATADIR%%/library
+%%DATADIR%%/print
+%%DATADIR%%/program
+%%DATADIR%%/rcs
+%%DATADIR%%/recursive
+%%DATADIR%%/sccs
+%%DATADIR%%/text
+%%DATADIR%%/usr
+%%DATADIR%%/usr.local
+%%DATADIR%%/yacc
+%%DATADIR%%/yacc_many
+%%PORTDOCS%%%%DOCSDIR%%/en/refman.dvi
+%%PORTDOCS%%%%DOCSDIR%%/en/refman.ps
+%%PORTDOCS%%%%DOCSDIR%%/en/refman.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial.dvi
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial.ps
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/user-guide.dvi
+%%PORTDOCS%%%%DOCSDIR%%/en/user-guide.ps
+%%PORTDOCS%%%%DOCSDIR%%/en/user-guide.txt
 @dirrm lib/cook/en/LC_MESSAGES
 @dirrm lib/cook/en
 @dirrm lib/cook
- at dirrm share/cook/en
- at dirrm share/cook
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%
Index: cook/files/patch-Makefile.in
===================================================================
RCS file: cook/files/patch-Makefile.in
diff -N cook/files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cook/files/patch-Makefile.in	20 Dec 2007 07:19:17 -0000
@@ -0,0 +1,37 @@
+--- ./Makefile.in.orig	Sun Sep 30 10:52:44 2007
++++ ./Makefile.in	Thu Dec 20 04:13:01 2007
+@@ -5361,17 +5361,15 @@
+ 	$(bindir)/$(PROGRAM_PREFIX)make2cook$(PROGRAM_SUFFIX)$(EXEEXT) \
+ 		$(bindir)/$(PROGRAM_PREFIX)roffpp$(PROGRAM_SUFFIX)$(EXEEXT)
+ 
+-install-man: $(datadir)/en/man1/c_incl.1 $(mandir)/man1/c_incl.1 \
+-		$(datadir)/en/man1/cook.1 $(mandir)/man1/cook.1 \
+-		$(datadir)/en/man1/cook_bom.1 $(mandir)/man1/cook_bom.1 \
+-		$(datadir)/en/man1/cook_lic.1 $(mandir)/man1/cook_lic.1 \
+-		$(datadir)/en/man1/cook_rsh.1 $(mandir)/man1/cook_rsh.1 \
+-		$(datadir)/en/man1/cookfp.1 $(mandir)/man1/cookfp.1 \
+-		$(datadir)/en/man1/cooktime.1 $(mandir)/man1/cooktime.1 \
+-		$(datadir)/en/man1/find_libs.1 \
++install-man: $(mandir)/man1/c_incl.1 \
++		$(mandir)/man1/cook.1 \
++		$(mandir)/man1/cook_bom.1 \
++		$(mandir)/man1/cook_lic.1 \
++		$(mandir)/man1/cook_rsh.1 \
++		$(mandir)/man1/cookfp.1 \
++		$(mandir)/man1/cooktime.1 \
+ 		$(mandir)/man1/find_libs.1 \
+-		$(datadir)/en/man1/make2cook.1 \
+-		$(mandir)/man1/make2cook.1 $(datadir)/en/man1/roffpp.1 \
++		$(mandir)/man1/make2cook.1 \
+ 		$(mandir)/man1/roffpp.1
+ 
+ po_install_files_yes = $(libdir)/en/LC_MESSAGES/c_incl.mo \
+@@ -5396,7 +5394,7 @@
+ 
+ groff_install_no =
+ 
+-install-groff: $(groff_install_ at have_groff@)
++install-groff:
+ 
+ install-lib: $(datadir)/as $(datadir)/bison $(datadir)/c $(datadir)/c++ \
+ 		$(datadir)/f77 $(datadir)/functions $(datadir)/g77 \
--- cook.diff ends here ---



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

