Date: Tue, 25 Nov 2003 12:14:50 -0800 From: Jason Evans <jasone@canonware.com> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/59661: Update cook to 2.24. Message-ID: <20031125201450.GC43401@canonware.com> In-Reply-To: <200311250000.hAP00d6c092082@freefall.freebsd.org> References: <20031124235555.C7329305@canonware.com> <200311250000.hAP00d6c092082@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--xXmbgvnjoT4axfJE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Attached is an updated patch, after Sergei's changes and suggestions. --xXmbgvnjoT4axfJE Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cook.diff" diff -Nru cook.orig/Makefile cook/Makefile --- cook.orig/Makefile Tue Nov 25 10:46:40 2003 +++ cook/Makefile Tue Nov 25 11:14:48 2003 @@ -6,12 +6,11 @@ # PORTNAME= cook -PORTVERSION= 2.23 -PORTREVISION= 1 +PORTVERSION= 2.24 CATEGORIES= devel MASTER_SITES= http://gd.tuwien.ac.at/softeng/Aegis/cook/ -MAINTAINER= ports@freebsd.org +MAINTAINER= jasone@canonware.com COMMENT= Like make(1), but more powerful and clean LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext @@ -19,11 +18,10 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \ YACC=yacc +CONFIGURE_TARGET= --build=${MACHINE_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 -MANPREFIX = ${PREFIX}/share/cook -MANLANG = "" en MANCOMPRESSED= no # Make sure that the whole directory tree exists. @@ -32,23 +30,8 @@ ${MKDIR} ${PREFIX}/lib/cook/en/LC_MESSAGES # cook installs extra copies of the manpages in a directory that MANLANG can't -# cope with, so shuffle things around a bit. +# cope with. Delete the extra copies. post-install: - @${MKDIR} ${PREFIX}/share/cook/en/man1 - @${MKDIR} ${PREFIX}/share/cook/man/en/man1 -.for manpage in ${MAN1} - @${MV} ${PREFIX}/share/cook/en/man1/${manpage} \ - ${PREFIX}/share/cook/man/en/man1/ -.endfor - @${TOUCH} ${PREFIX}/share/cook/en/man1/.not_empty - @${MKDIR} ${PREFIX}/share/cook/man/man1 -.for manpage in ${MAN1} - @${MV} ${PREFIX}/man/man1/${manpage} ${PREFIX}/share/cook/man/man1/ -.endfor - @echo - @echo "Add ${PREFIX}/share/cook/man to your MANPATH in order to" \ - "access the manual" - @echo "pages included with this port." - @echo + @${RM} -rf ${PREFIX}/share/cook/en/man1 .include <bsd.port.mk> diff -Nru cook.orig/distinfo cook/distinfo --- cook.orig/distinfo Tue Nov 25 10:46:40 2003 +++ cook/distinfo Tue Nov 25 10:49:08 2003 @@ -1 +1 @@ -MD5 (cook-2.23.tar.gz) = f8c6721a3d96a641e748904e12defd25 +MD5 (cook-2.24.tar.gz) = a6614c7fbabfa7450fec990715684e14 diff -Nru cook.orig/pkg-message cook/pkg-message --- cook.orig/pkg-message Tue Nov 25 10:46:40 2003 +++ cook/pkg-message Wed Dec 31 16:00:00 1969 @@ -1,2 +0,0 @@ -Add ${PREFIX}/share/cook/man to your MANPATH in order to access the manual -pages included with this port. diff -Nru cook.orig/pkg-plist cook/pkg-plist --- cook.orig/pkg-plist Tue Nov 25 10:46:40 2003 +++ cook/pkg-plist Tue Nov 25 11:12:42 2003 @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/c_incl bin/cook bin/cook_bom @@ -14,32 +15,21 @@ lib/cook/en/LC_MESSAGES/cooktime.mo lib/cook/en/LC_MESSAGES/file_check.mo lib/cook/en/LC_MESSAGES/find_libs.mo -lib/cook/en/LC_MESSAGES/fstrcmp.mo lib/cook/en/LC_MESSAGES/make2cook.mo lib/cook/en/LC_MESSAGES/roffpp.mo -share/cook/en/building.ps -share/cook/en/building.dvi -share/cook/en/building.txt -share/cook/en/lsm.ps -share/cook/en/lsm.dvi -share/cook/en/lsm.txt -share/cook/en/man1/.not_empty -share/cook/en/readme.ps -share/cook/en/readme.dvi -share/cook/en/readme.txt -share/cook/en/refman.ps -share/cook/en/refman.dvi -share/cook/en/refman.txt -share/cook/en/release.ps -share/cook/en/release.dvi -share/cook/en/release.txt -share/cook/en/user-guide.ps -share/cook/en/user-guide.dvi -share/cook/en/user-guide.txt 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 @@ -54,9 +44,6 @@ share/cook/recursive share/cook/sccs share/cook/text -share/cook/en/tutorial.dvi -share/cook/en/tutorial.ps -share/cook/en/tutorial.txt share/cook/usr share/cook/usr.local share/cook/yacc @@ -64,10 +51,5 @@ @dirrm lib/cook/en/LC_MESSAGES @dirrm lib/cook/en @dirrm lib/cook -@dirrm share/cook/man/en/man1 -@dirrm share/cook/man/en -@dirrm share/cook/man/man1 -@dirrm share/cook/man -@dirrm share/cook/en/man1 @dirrm share/cook/en @dirrm share/cook --xXmbgvnjoT4axfJE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031125201450.GC43401>