On Mon, Mar 21, 2011 at 04:22:05PM +0000, Christian Weisgerber wrote: > Alexandr Shadchin <[email protected]> wrote: > > > This update package d1489 to the latest release 1.5.1. > > Fix MASTER_SITES and update. Tested on i386 and amd64. > > I'd just override the relevant stuff with > > MAKE_FLAGS= LOCAL_CFLAGS=-DHAVE_MKSTEMP LOCAL_LDFLAGS="" > > and wouldn't bother with patch-Makefile. PREFIX appears only in > the install target, which we don't use anyway. > > -- > Christian "naddy" Weisgerber [email protected] >
nice tip, thanks -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/russian/d1489/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 24 Jul 2010 17:36:16 -0000 1.12 +++ Makefile 21 Mar 2011 16:43:08 -0000 @@ -3,11 +3,10 @@ COMMENT= cp866<>koi8-r & cp1251<>koi8-r decoders and font converter -DISTNAME= d1489-1.4 -REVISION= 0 +DISTNAME= d1489-1.5.1 CATEGORIES= russian -MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/convert/char/ +MASTER_SITES= http://koi8.pp.ru/dist/ EXTRACT_SUFX= .tgz # MIT @@ -16,9 +15,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c +WANTLIB= c NO_REGRESS= Yes + +MAKE_FLAGS= LOCAL_CFLAGS=-DHAVE_MKSTEMP LOCAL_LDFLAGS="" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/todos ${PREFIX}/bin Index: distinfo =================================================================== RCS file: /cvs/ports/russian/d1489/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 17:26:06 -0000 1.3 +++ distinfo 21 Mar 2011 16:43:08 -0000 @@ -1,5 +1,5 @@ -MD5 (d1489-1.4.tgz) = HuHzajqRdNe/44bsef8d2Q== -RMD160 (d1489-1.4.tgz) = HWa5KkywPkJWIw8ll3hOUgGF5r4= -SHA1 (d1489-1.4.tgz) = ZI3I96+GAjfQnVV4S7hpvYBYSRA= -SHA256 (d1489-1.4.tgz) = j41jPr0OYiQ1zMqoyBWU82+qIbGp3+zLBw8rB+FkX9I= -SIZE (d1489-1.4.tgz) = 9588 +MD5 (d1489-1.5.1.tgz) = 2IyI5oYF9E5xnWjCWMG8ig== +RMD160 (d1489-1.5.1.tgz) = BA7+Gz0cAEDKxytrheagaeiCiDU= +SHA1 (d1489-1.5.1.tgz) = mGNKwrgMdpICHgeYteoZdEkPnQI= +SHA256 (d1489-1.5.1.tgz) = eyoCp8Wh95VoETQcAST8Xpzbhd95VsAYs43EEXgpnn4= +SIZE (d1489-1.5.1.tgz) = 9862 Index: patches/patch-Makefile =================================================================== RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 26 Oct 2007 21:41:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.1 2007/10/26 21:41:28 jasper Exp $ ---- Makefile.orig Wed Nov 5 02:25:46 1997 -+++ Makefile Fri Oct 26 23:40:11 2007 -@@ -23,7 +23,7 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - --CFLAGS=-O -+CFLAGS+=-DHAVE_MKSTEMP - #CFLAGS=-O -DNO_RENAME - LDFLAGS=-s - Index: patches/patch-todos_c =================================================================== RCS file: /cvs/ports/russian/d1489/patches/patch-todos_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-todos_c --- patches/patch-todos_c 26 Oct 2007 21:41:29 -0000 1.1 +++ patches/patch-todos_c 21 Mar 2011 16:43:08 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-todos_c,v 1.1 2007/10/26 21:41:29 jasper Exp $ ---- todos.c.orig Tue Dec 22 00:50:00 1998 -+++ todos.c Fri Oct 26 23:40:11 2007 +--- todos.c.orig Fri Jan 3 01:17:18 2003 ++++ todos.c Sun Mar 20 22:24:09 2011 @@ -33,6 +33,7 @@ #include <stdio.h> #include <string.h> @@ -27,7 +27,7 @@ $OpenBSD: patch-todos_c,v 1.1 2007/10/26 char tmp_pat[] = "$1489_XXXXXX"; char tmp_name[256], out_name[256]; char **table; -@@ -251,10 +254,21 @@ usage: +@@ -258,10 +261,21 @@ usage: } sprintf(tmp_name, "%s%s%s", outdir, *outdir ? "/" : "", tmp_pat); @@ -49,7 +49,7 @@ $OpenBSD: patch-todos_c,v 1.1 2007/10/26 while (ac-- > 1) { srcn = av[1]; -@@ -267,10 +281,12 @@ usage: +@@ -274,10 +288,12 @@ usage: perror(srcn); goto usage; }
