ports/65262: Update port: lang/open-cobol

[KATO Tsuguru]

>Number:         65262
>Category:       ports
>Synopsis:       Update port: lang/open-cobol
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 06 10:40:09 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support USE_GETOPT_LONG
- Support WITHOUT_NLS
 
New file:
files/patch-cobc::cobc.c
files/patch-lib::Makefile.in

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/lang/open-cobol/Makefile lang/open-cobol/Makefile
--- /usr/ports/lang/open-cobol/Makefile	Wed Feb  4 19:00:57 2004
+++ lang/open-cobol/Makefile	Sun Apr  4 00:42:47 2004
@@ -19,14 +19,25 @@
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-readline
 INSTALLS_SHLIB=	yes
 
 INFO=		open-cobol
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
 USE_GETTEXT=	yes
+LDFLAGS+=	-lintl
+PLIST_SUB+=	NLS=""
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/lang/open-cobol/files/patch-cobc::cobc.c lang/open-cobol/files/patch-cobc::cobc.c
--- /usr/ports/lang/open-cobol/files/patch-cobc::cobc.c	Thu Jan  1 09:00:00 1970
+++ lang/open-cobol/files/patch-cobc::cobc.c	Sun Apr  4 00:32:46 2004
@@ -0,0 +1,11 @@
+--- cobc/cobc.c.orig	Thu Jun  5 09:02:15 2003
++++ cobc/cobc.c	Sun Apr  4 00:32:21 2004
+@@ -36,7 +36,7 @@
+ 
+ #include "cobc.h"
+ #include "tree.h"
+-#include "lib/getopt.h"
++#include <getopt.h>
+ 
+ 
+ /*
diff -urN /usr/ports/lang/open-cobol/files/patch-lib::Makefile.in lang/open-cobol/files/patch-lib::Makefile.in
--- /usr/ports/lang/open-cobol/files/patch-lib::Makefile.in	Thu Jan  1 09:00:00 1970
+++ lang/open-cobol/files/patch-lib::Makefile.in	Sun Apr  4 00:29:15 2004
@@ -0,0 +1,20 @@
+--- lib/Makefile.in.orig	Thu Jun 12 05:13:50 2003
++++ lib/Makefile.in	Sun Apr  4 00:28:58 2004
+@@ -175,7 +175,7 @@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po \
++ at AMDEP_TRUE@DEP_FILES = \
+ @AMDEP_TRUE@	$(DEPDIR)/malloc.Po $(DEPDIR)/memcmp.Po \
+ @AMDEP_TRUE@	$(DEPDIR)/realloc.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -215,8 +215,6 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+- at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcmp.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po at am__quote@
diff -urN /usr/ports/lang/open-cobol/pkg-plist lang/open-cobol/pkg-plist
--- /usr/ports/lang/open-cobol/pkg-plist	Thu Aug 28 08:34:01 2003
+++ lang/open-cobol/pkg-plist	Sun Apr  4 00:40:37 2004
@@ -14,5 +14,5 @@
 lib/libcob.a
 lib/libcob.so
 lib/libcob.so.1
-share/locale/ja/LC_MESSAGES/open-cobol.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/open-cobol.mo
 @dirrm include/libcob
>Release-Note:
>Audit-Trail:
>Unformatted: