ports/146503: [MAINTAINER] sysutils/di: update to 4.23

[Naram Qashat]

>Number:         146503
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/di: update to 4.23
>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:   Tue May 11 21:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Fri Apr 16 09:09:45 EDT 2010
>Description:
- Update to 4.23

Added file(s):
- files/patch-features-turnoffnls.sh

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- di-4.23.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/di/Makefile /kirby/shared/ports/di/Makefile
--- /usr/ports/sysutils/di/Makefile	2010-05-07 08:18:30.000000000 -0400
+++ /kirby/shared/ports/di/Makefile	2010-05-11 07:35:17.000000000 -0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	di
-PORTVERSION=	4.22
+PORTVERSION=	4.23
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.gentoo.com/di/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
diff -ruN --exclude=CVS /usr/ports/sysutils/di/distinfo /kirby/shared/ports/di/distinfo
--- /usr/ports/sysutils/di/distinfo	2010-05-07 08:18:30.000000000 -0400
+++ /kirby/shared/ports/di/distinfo	2010-05-11 07:35:26.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (di-4.22.tar.gz) = 18deed2ec26c27c04b231cfc683ea0d9
-SHA256 (di-4.22.tar.gz) = 0ef867d3dfadd2b4380c323dbdc44fcef7442c58b3fea3b49afcc7d91bd833f5
-SIZE (di-4.22.tar.gz) = 80367
+MD5 (di-4.23.tar.gz) = 795e072d528c8e8f0d8cad094d6ae003
+SHA256 (di-4.23.tar.gz) = 0247f45fd0bda8da9ec0472e6071db0ff14682e7511aa2780c4e3d83c0bc7dd2
+SIZE (di-4.23.tar.gz) = 84449
diff -ruN --exclude=CVS /usr/ports/sysutils/di/files/patch-Makefile /kirby/shared/ports/di/files/patch-Makefile
--- /usr/ports/sysutils/di/files/patch-Makefile	2010-05-07 05:01:07.000000000 -0400
+++ /kirby/shared/ports/di/files/patch-Makefile	2010-05-11 07:38:10.000000000 -0400
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-03-31 11:30:14.000000000 -0400
-+++ Makefile	2010-04-10 01:28:44.000000000 -0400
+--- Makefile.orig	2010-05-11 01:55:01.000000000 -0400
++++ Makefile	2010-05-11 07:37:54.000000000 -0400
 @@ -9,7 +9,7 @@
  SHELL = /bin/sh
  OBJ_EXT = .o
@@ -27,19 +27,19 @@
  DI_MANDIR = $(DI_MANINSTDIR)/man1
  MAN_TARGET = $(PROG).1
  MANPERM = 644
-@@ -167,7 +167,7 @@
+@@ -180,7 +180,7 @@
+ 	$(MAKE) \
  		CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \
- 		CFLAGS="$(CFLAGS) -O \
- 		-DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \
+ 		CFLAGS="$(CFLAGS) -O" \
 -		LDFLAGS="-O" di-programs
 +		LDFLAGS="-O $(LDFLAGS)" di-programs
  
  bsd43-gcc:
  	@echo ':' > di.env;chmod a+rx di.env
-@@ -177,7 +177,7 @@
- 		CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \
- 		CFLAGS="$(CFLAGS) -O2 \
- 		-DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \
+@@ -190,7 +190,7 @@
+ 	$(MAKE) \
+ 		CC=gcc LD=gcc EXE_EXT="" OBJ_EXT=".o" \
+ 		CFLAGS="$(CFLAGS) -O2" \
 -		LDFLAGS="-O2" di-programs
 +		LDFLAGS="-O2 $(LDFLAGS)" di-programs
  
diff -ruN --exclude=CVS /usr/ports/sysutils/di/files/patch-features-turnoffnls.sh /kirby/shared/ports/di/files/patch-features-turnoffnls.sh
--- /usr/ports/sysutils/di/files/patch-features-turnoffnls.sh	1969-12-31 19:00:00.000000000 -0500
+++ /kirby/shared/ports/di/files/patch-features-turnoffnls.sh	2010-05-11 17:16:00.000000000 -0400
@@ -0,0 +1,14 @@
+Patch provided upstream from Brad Lanam to fix turning off NLS support under FreeBSD.
+
+--- features/turnoffnls.sh.orig	2010-05-11 01:55:01.000000000 -0400
++++ features/turnoffnls.sh	2010-05-11 17:15:05.000000000 -0400
+@@ -17,7 +17,7 @@
+ /^#define _hdr_locale/ s/1/0/
+ /^#define _command_msgfmt/ s/1/0/
+ _HERE_
+-sed -i -f $TMP config.h
+-rm -f $TMP
++sed -i.bak -f $TMP config.h
++rm -f $TMP config.h.bak
+ 
+ exit 0
--- di-4.23.patch ends here ---

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