From tkato432@yahoo.com  Fri Jun 16 17:01:13 2006
Return-Path: <tkato432@yahoo.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C72A116A4A6
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 16 Jun 2006 17:01:03 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from nm05omta059.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.9])
	by mx1.FreeBSD.org (Postfix) with SMTP id 3503943D45
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 16 Jun 2006 17:01:03 +0000 (GMT)
	(envelope-from tkato432@yahoo.com)
Received: from localhost ([218.222.67.160])
	by nm05mta.dion.ne.jp
	id <20060617020100132.MA91.808F4E0@nm05mta.dion.ne.jp>;
	Sat, 17 Jun 2006 02:01:00 +0900
Message-Id: <20060617020019.583c622d.tkato432@yahoo.com>
Date: Sat, 17 Jun 2006 02:00:19 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: lang/elk to 3.99.7

>Number:         99045
>Category:       ports
>Synopsis:       Update port: lang/elk to 3.99.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 16 17:10:18 GMT 2006
>Closed-Date:    Sat Jun 17 09:36:37 GMT 2006
>Last-Modified:  Sat Jun 17 09:36:37 GMT 2006
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p18 i386
>Organization:
>Environment:
>Description:
- Update to version 3.99.7

Remove file:
files/patch-Makefile.in
files/patch-configure

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/lang/elk/Makefile lang/elk/Makefile
--- /usr/ports/lang/elk/Makefile	Fri Feb 24 00:41:14 2006
+++ lang/elk/Makefile	Thu Jun 15 16:10:36 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	elk
-PORTVERSION=	3.99.6
-PORTREVISION=	3
+PORTVERSION=	3.99.7
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
@@ -19,21 +18,25 @@
 
 USE_BZIP2=	yes
 USE_MOTIF=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
 MAN1=		elk.1
 
-CPPFLAGS=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include \
+		-I${X11BASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS=		-O0
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc examples||g' ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/elk.1 ${MANPREFIX}/man/man1
diff -urN /usr/ports/lang/elk/distinfo lang/elk/distinfo
--- /usr/ports/lang/elk/distinfo	Fri Nov 25 13:37:16 2005
+++ lang/elk/distinfo	Thu Jun 15 13:58:23 2006
@@ -1,3 +1,3 @@
-MD5 (elk-3.99.6.tar.bz2) = d5ba4f56796a3c3798164131ae7b0e10
-SHA256 (elk-3.99.6.tar.bz2) = 3aad8e5e6c0ec2207cdc3060557752c1820467f590825d2c20954d2658e2d96d
-SIZE (elk-3.99.6.tar.bz2) = 643615
+MD5 (elk-3.99.7.tar.bz2) = 6711247691266f36742bd3db9311dc4a
+SHA256 (elk-3.99.7.tar.bz2) = a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c
+SIZE (elk-3.99.7.tar.bz2) = 646698
diff -urN /usr/ports/lang/elk/files/patch-Makefile.in lang/elk/files/patch-Makefile.in
--- /usr/ports/lang/elk/files/patch-Makefile.in	Thu Sep 25 00:03:39 2003
+++ lang/elk/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Sep 13 15:34:23 2003
-+++ Makefile.in	Sun Sep 14 05:02:54 2003
-@@ -167,7 +167,7 @@
- target_vendor = @target_vendor@
- NULL = 
- 
--SUBDIRS = include src lib scm doc examples
-+SUBDIRS = include src lib scm
- DIST_SUBDIRS = $(SUBDIRS) autotools debian
- 
- EXTRA_DIST = \
diff -urN /usr/ports/lang/elk/files/patch-configure lang/elk/files/patch-configure
--- /usr/ports/lang/elk/files/patch-configure	Mon Dec  8 05:41:19 2003
+++ lang/elk/files/patch-configure	Thu Jan  1 09:00:00 1970
@@ -1,21 +0,0 @@
---- configure.orig	Fri Dec  5 21:51:16 2003
-+++ configure	Sat Dec  6 12:56:19 2003
-@@ -19318,6 +19318,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -25330,8 +25331,8 @@
- # The directory where all files are installed by running "make install". We
- # cannot use AC_DEFINE_UNQUOTED here because ${prefix} is not set until the
- # end of the configure script. Thanks to Phillip Rulon for spotting that.
--CPPFLAGS="${CPPFLAGS} -DSCM_DIR=\\\"\$(prefix)/share/elk\\\""
--CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\\\"\$(prefix)/lib/elk\\\""
-+CPPFLAGS="${CPPFLAGS} -DSCM_DIR=\"\\\"\$(prefix)/share/elk\\\"\""
-+CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\"\\\"\$(prefix)/lib/elk\\\"\""
- 
- #define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || defined(INIT_OBJECTS)
- 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: erwin 
State-Changed-When: Sat Jun 17 09:36:32 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99045 
>Unformatted:
