From alex@vaio.alexdupre.com  Tue May 14 08:57:16 2002
Return-Path: <alex@vaio.alexdupre.com>
Received: from vaio.alexdupre.com (212-41-211-209.adsl.galactica.it [212.41.211.209])
	by hub.freebsd.org (Postfix) with ESMTP id B92B937B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 May 2002 08:56:57 -0700 (PDT)
Received: from vaio.alexdupre.com (localhost [127.0.0.1])
	by vaio.alexdupre.com (8.12.2/8.12.2) with ESMTP id g4EG6m0c004798
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 May 2002 18:06:48 +0200 (CEST)
	(envelope-from alex@vaio.alexdupre.com)
Received: (from alex@localhost)
	by vaio.alexdupre.com (8.12.2/8.12.2/Submit) id g4EG6kgq004797;
	Tue, 14 May 2002 18:06:46 +0200 (CEST)
Message-Id: <200205141606.g4EG6kgq004797@vaio.alexdupre.com>
Date: Tue, 14 May 2002 18:06:46 +0200 (CEST)
From: Alex Dupre <sysadmin@alexdupre.com>
Reply-To: Alex Dupre <sysadmin@alexdupre.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Update Port] devel/motor (to 3.2.2)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         38076
>Category:       ports
>Synopsis:       [Update Port] devel/motor (to 3.2.2)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 14 09:00:05 PDT 2002
>Closed-Date:    Thu May 16 04:26:09 PDT 2002
>Last-Modified:  Thu May 16 04:26:09 PDT 2002
>Originator:     Alex Dupre
>Release:        FreeBSD 4.5-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD vaio.alexdupre.com 4.5-ALEXDUPRE FreeBSD 4.5-ALEXDUPRE #0: Fri Apr 12 14:12:57 CEST 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386


	
>Description:
Update to latest release.
Remove libgnugetopt dependency
Add ncurses dependency
Install some docs
Remove (now useless) patches
	
>How-To-Repeat:
	
>Fix:

	

--- motor.diff begins here ---
diff -ruN motor.orig/Makefile motor/Makefile
--- motor.orig/Makefile	Tue May 14 13:38:05 2002
+++ motor/Makefile	Tue May 14 13:40:34 2002
@@ -6,23 +6,30 @@
 #
 
 PORTNAME=	motor
-PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 CATEGORIES=	devel
-MASTER_SITES=	http://konst.org.ua/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sobomax
+MASTER_SITES=	http://konst.org.ua/download/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl -lgnugetopt"
 
 MAN1=		motor.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 400010
+LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
+.endif
+
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC} ; ${INSTALL_DATA} FAQ README ${DOCSDIR})
+.endif
+
+.include <bsd.port.post.mk>
+
diff -ruN motor.orig/distinfo motor/distinfo
--- motor.orig/distinfo	Tue May 14 13:38:05 2002
+++ motor/distinfo	Tue May 14 13:40:49 2002
@@ -1 +1 @@
-MD5 (motor-3.2.0.tar.gz) = 893d55c9fe7748aa6e2614b8c801ff1f
+MD5 (motor-3.2.2.tar.gz) = 2f3a95b4fe0955cb88568d48df1d2342
diff -ruN motor.orig/files/patch-src::Makefile.in motor/files/patch-src::Makefile.in
--- motor.orig/files/patch-src::Makefile.in	Tue May 14 13:38:05 2002
+++ motor/files/patch-src::Makefile.in	Thu Jan  1 01:00:00 1970
@@ -1,19 +0,0 @@
---- src/Makefile.in.orig	Thu Jun  7 10:50:20 2001
-+++ src/Makefile.in	Fri Aug  3 11:55:15 2001
-@@ -61,6 +61,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CXX = @CXX@
-+CPPFLAGS = @CPPFLAGS@
- DATADIRNAME = @DATADIRNAME@
- GENCAT = @GENCAT@
- GMOFILES = @GMOFILES@
-@@ -87,7 +88,7 @@
- INCLUDES = -I../include -I../kkstrtext -I../kkconsui/include     -I../kksystr/include -I../parser/include -I$(top_srcdir)/intl
- 
- 
--CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
-+CPPFLAGS += -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
- 
- bin_PROGRAMS = motor
- 
diff -ruN motor.orig/files/patch-src::configuration::Makefile.in motor/files/patch-src::configuration::Makefile.in
--- motor.orig/files/patch-src::configuration::Makefile.in	Tue May 14 13:38:05 2002
+++ motor/files/patch-src::configuration::Makefile.in	Thu Jan  1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/devel/motor/files/patch-src::configuration::Makefile.in,v 1.1 2001/10/08 13:50:54 sobomax Exp $
-
---- src/configuration/Makefile.in	2001/10/08 13:16:39	1.1
-+++ src/configuration/Makefile.in	2001/10/08 13:17:10
-@@ -89,7 +89,7 @@
- INCLUDES = -I$(top_srcdir)/kkstrtext -I$(top_srcdir)/kkconsui/include     -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/intl     -I$(top_srcdir)/src/ui/ncurses -I$(top_srcdir)/src/debugger     -I$(top_srcdir)/src/executor -I$(top_srcdir)/src/project     -I$(top_srcdir)/src/ui -I$(top_srcdir)/src/tagbrowser -I$(top_srcdir)/src     -I$(top_srcdir)/parser/include
- 
- 
--CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
-+CPPFLAGS = @CPPFLAGS@ -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
- 
- libconfiguration_a_SOURCES = motorconfiguration.cc extkey.cc
- 
diff -ruN motor.orig/files/patch-src::manager::Makefile.in motor/files/patch-src::manager::Makefile.in
--- motor.orig/files/patch-src::manager::Makefile.in	Tue May 14 13:38:05 2002
+++ motor/files/patch-src::manager::Makefile.in	Thu Jan  1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/devel/motor/files/patch-src::manager::Makefile.in,v 1.1 2001/10/08 13:50:54 sobomax Exp $
-
---- src/manager/Makefile.in	2001/10/08 13:19:11	1.1
-+++ src/manager/Makefile.in	2001/10/08 13:19:28
-@@ -89,7 +89,7 @@
- INCLUDES = -I$(top_srcdir)/kkstrtext -I$(top_srcdir)/kkconsui/include     -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/intl     -I$(top_srcdir)/src/ui/ncurses -I$(top_srcdir)/src/debugger     -I$(top_srcdir)/src/executor -I$(top_srcdir)/src/project     -I$(top_srcdir)/src/configuration -I$(top_srcdir)/src     -I$(top_srcdir)/src/tagbrowser -I$(top_srcdir)/parser/include
- 
- 
--CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
-+CPPFLAGS = @CPPFLAGS@ -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
- 
- libmanager_a_SOURCES = motormanager.cc
- 
diff -ruN motor.orig/pkg-plist motor/pkg-plist
--- motor.orig/pkg-plist	Tue May 14 13:38:05 2002
+++ motor/pkg-plist	Tue May 14 13:53:12 2002
@@ -56,3 +56,6 @@
 @dirrm share/motor/templates/library
 @dirrm share/motor/templates
 @dirrm share/motor
+%%PORTDOCS%%share/doc/motor/FAQ
+%%PORTDOCS%%share/doc/motor/README
+%%PORTDOCS%%@dirrm share/doc/motor
--- motor.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Maxim Sobolev <sobomax@FreeBSD.org>
To: Alex Dupre <sysadmin@alexdupre.com>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/38076: [Update Port] devel/motor (to 3.2.2)
Date: Tue, 14 May 2002 20:03:35 +0300

 Great, I'll take a look at it tomorrow. BTW, do you care enough to
 take over maintainership for this port? I'll be glad to give it to
 somebody who wants it.
 
 -Maxim
 
 Alex Dupre wrote:
 > 
 > >Number:         38076
 > >Category:       ports
 > >Synopsis:       [Update Port] devel/motor (to 3.2.2)
 > >Confidential:   no
 > >Severity:       serious
 > >Priority:       medium
 > >Responsible:    freebsd-ports
 > >State:          closed
 > >Quarter:
 > >Keywords:
 > >Date-Required:
 > >Class:          update
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Tue May 14 09:00:05 PDT 2002
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Alex Dupre
 > >Release:        FreeBSD 4.5-ALEXDUPRE i386
 > >Organization:
 > >Environment:
 > System: FreeBSD vaio.alexdupre.com 4.5-ALEXDUPRE FreeBSD 4.5-ALEXDUPRE #0: Fri Apr 12 14:12:57 CEST 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386
Responsible-Changed-From-To: freebsd-ports->sobomax 
Responsible-Changed-By: pat 
Responsible-Changed-When: Tue May 14 14:24:34 PDT 2002 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38076 
State-Changed-From-To: open->closed 
State-Changed-By: sobomax 
State-Changed-When: Thu May 16 04:22:26 PDT 2002 
State-Changed-Why:  
Update committed, thank you. Few notes: 

- You shouldn't take out CPPFLAGS and LDFLAGS, because otherwise installed 
libintl isn't picked up by configure script, resulting in bloating binary 
with duplicate gettext code; 
- as a result of the above, patches that you have removed are still necessary; 
- it doesn't compile on -current because of the problem with consio.h 
header, so I've added -fpermissive flag into src/debugger/Makefile.in - don't 
remove that patch in the next upgrade. 

Other than that - fine, I've added you as a MAINTAINER. 

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