ports/58960: Update port: devel/kimwitu++ to 2.3.8

[KATO Tsuguru]

>Number:         58960
>Category:       ports
>Synopsis:       Update port: devel/kimwitu++ to 2.3.8
>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:   Wed Nov 05 06:10:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.3.8

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/devel/kimwitu++/Makefile devel/kimwitu++/Makefile
--- /usr/ports/devel/kimwitu++/Makefile	Sat Apr 12 22:41:08 2003
+++ devel/kimwitu++/Makefile	Wed Nov  5 22:54:51 2003
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	kimwitu++
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.8
 CATEGORIES=	devel
 MASTER_SITES=	http://site.informatik.hu-berlin.de/kimwitu++/
 
@@ -15,6 +15,7 @@
 COMMENT=	A tool for processing trees (i.e. terms)
 
 USE_BISON=	yes
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff -urN /usr/ports/devel/kimwitu++/distinfo devel/kimwitu++/distinfo
--- /usr/ports/devel/kimwitu++/distinfo	Mon Jan  6 15:56:29 2003
+++ devel/kimwitu++/distinfo	Sun Nov  2 13:21:22 2003
@@ -1 +1 @@
-MD5 (kimwitu++-2.3.3.tar.gz) = 7f5288f1a2786a79be0e03e1a2c94196
+MD5 (kimwitu++-2.3.8.tar.gz) = 3f29ff9599cdebd84b2d212771b5c12a
diff -urN /usr/ports/devel/kimwitu++/files/patch-src::Makefile.in devel/kimwitu++/files/patch-src::Makefile.in
--- /usr/ports/devel/kimwitu++/files/patch-src::Makefile.in	Mon Jan  6 15:56:29 2003
+++ devel/kimwitu++/files/patch-src::Makefile.in	Sun Nov  2 14:10:49 2003
@@ -1,30 +1,50 @@
---- src/Makefile.in.orig	Wed Nov 20 20:27:27 2002
-+++ src/Makefile.in	Sat Dec 28 06:35:54 2002
-@@ -146,14 +146,14 @@
+--- src/Makefile.in.orig	Fri Oct 24 00:22:46 2003
++++ src/Makefile.in	Sun Nov  2 14:10:46 2003
+@@ -101,8 +101,8 @@
+ LY_HFILES := kimwy.h
+ LY_TFILE := kimwy.output
+ LY_OBJS := $(LY_CFILES:cc=o)
+-GETOPT_CFILES := getopt.h getopt.c getopt1.c
+-GETOPT_OBJS := getopt.o getopt1.o
++#GETOPT_CFILES := getopt.h getopt.c getopt1.c
++#GETOPT_OBJS := getopt.o getopt1.o
+ DF_HFILES := defs.h defs.hh
+ ERRMSG_CC_FILE := errmsg.inc
+ 
+@@ -160,20 +160,20 @@
  #YCFLAGS += -DMYLEXDEBUG
  #YCFLAGS += -DYYDEBUG=1 -DMYLEXDEBUG
  DEFINES := -DARCH=$(ARCH) @hashset@
 -CXXFLAGS := -g
--CXXFLAGSOPT := -O2\ -s
-+CXXFLAGS := @CXXFLAGS@
-+#CXXFLAGSOPT := -O2\ -s
+-CXXFLAGSOPT := -O2
++#CXXFLAGS := -g
++CXXFLAGSOPT := @CXXFLAGS@ @CPPFLAGS@
  CFLAGS := $(CXXFLAGS) -DHAVE_CONFIG_H -I.
  
  ifneq (,$(findstring ++,$(CXX)))
  # -ansi should be here but it's buggy (and should be called -iso anyway)
 -CXXFLAGS := -Wall -Wno-unused -Wno-uninitialized -g
--CXXFLAGSOPT := $(CXXFLAGSOPT)\ -Os
-+CXXFLAGS += -Wall -Wno-unused -Wno-uninitialized
-+#CXXFLAGSOPT := $(CXXFLAGSOPT)\ -Os
+-CXXFLAGSOPT := $(CXXFLAGSOPT)\ -s\ -Os
++#CXXFLAGS := -Wall -Wno-unused -Wno-uninitialized -g
++#CXXFLAGSOPT := $(CXXFLAGSOPT)\ -s\ -Os
    ifeq "$(WARN)" "y"
      CXXFLAGS += -Wold-style-cast -Weffc++
    endif
-@@ -189,7 +189,7 @@
+ endif
+ override CXXFLAGS += $(INCLUDES) $(DEFINES)
+-LIBS := @PYLIBS@
++LIBS := @PYLIBS@ @LDFLAGS@
+ PYCFLAGS := @PYCFLAGS@
+ LINT_CFLAGS := $(INCLUDES) $(GENDEFINES)
+ MALLOC_LDFLAGS := $(ANY_ARCH_MALLOC_LDFLAGS)
+@@ -202,8 +202,8 @@
+ 	cp $(MAKERUNDIR)/$(CONFIGFILE) $(CONFIGFILE); \
  	touch tstamp.kc ; \
  	$(MAKE) -e -f $(MAKERUNDIR)/Makefile \
- 		MAKERUNDIR=$(MAKERUNDIR) \
+-		MAKERUNDIR=$(MAKERUNDIR) \
 -		CXXFLAGS=$(CXXFLAGSOPT) \
-+		CXXFLAGS="$(CXXFLAGS)" \
++		MAKERUNDIR="$(MAKERUNDIR)" \
++		CXXFLAGS="$(CXXFLAGSOPT)" \
  		$(BOOTSTRAPTARGET)
  
  s1:
>Release-Note:
>Audit-Trail:
>Unformatted: