Bug 47861

Summary: Maintainer update: x11-toolkits/flvw (build fix)
Product: Ports & Packages Reporter: Cyrille Lefevre <cyrille.lefevre>
Component: Individual Port(s)Assignee: markp <markp>
Status: Closed FIXED    
Severity: Affects Only Me CC: astrocrazy
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
file.diff none

Description Cyrille Lefevre 2003-02-03 17:20:10 UTC 
	flvw doesn't build anymore. this PR fix the build.

	please, commit x11-toolkits/fl_editor and databases/mysql-gui PRs
	when you'll commit this one. thanks in advance.

	Makefile
		PORTREVISION bumped
	files/patch-FL::Flv_List.H
		new file

Fix: take care, this patch set is in two parts.
	the first one is a diff against /dev/null
	and the second one a cvs diff.
How-To-Repeat: 	cd /usr/ports/x11-toolkits/flvw; make
Comment 1 markp freebsd_committer freebsd_triage 2003-02-14 09:25:18 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->markp

I'll handle this one.
Comment 2 mark 2003-02-14 09:26:17 UTC 
Hi,

Would you have any objections to this patch instead? 

I've dropped the patch in favour of REINPLACE which saves creating an
extra file. Also, PORTREVISION is only necessary for functional
changes.

Regards,
Mark

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/flvw/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	17 Jan 2002 23:13:38 -0000	1.2
+++ Makefile	14 Feb 2003 09:20:04 -0000
@@ -21,6 +21,7 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	DIRS=src
+USE_REINPLACE=	yes
 
 DOC_FILES=	documentation/html/*.html
 DOC_SUBDIR=	share/doc/${PKGBASE}
@@ -29,6 +30,10 @@
 INC_SUBDIR=	include/FL
 
 INSTALLS_SHLIB=	yes
+
+post-patch:
+	${REINPLACE_CMD} 's/^#define fl_inactive inactive//' \
+		${WRKSRC}/FL/Flv_List.H
 
 post-install: symlink-inc install-doc
Comment 3 clefevre-spam 2003-02-26 20:58:58 UTC 
approved, thanks.

Cyrille.
-- 
mailto:clefevre-news%no-spam@noos.fr.invalid     | UNIX is user-friendly; it's
Supprimer %no-spam et .invalid pour me repondre. | just particular about who
it
Remove %no-spam and .invalid to answer me back.  | chooses to be friends with.
Comment 4 Cyrille Lefevre 2003-05-27 04:46:25 UTC 
http://bento.freebsd.org/errorlogs/i386-5-latest/flvw-20000224.log

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/flvw/Makefile,v
retrieving revision 1.4
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.4 Makefile
--- Makefile	6 May 2003 07:06:52 -0000	1.4
+++ Makefile	27 May 2003 03:34:47 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +16,11 @@
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	Virtual Widgets for the Fast Light ToolKit
 
-BROKEN=		"Does not compile"
-
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/1.0
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	DIRS=src
@@ -32,6 +32,12 @@
 INC_SUBDIR=	include/FL
 
 INSTALLS_SHLIB=	yes
+
+post-patch:
+	${REINPLACE_CMD} 's/^#define fl_inactive inactive//' \
+		${WRKSRC}/FL/Flv_List.H
+	${REINPLACE_CMD} 's/\(friend\) \(Flv_Style_List\)/\1 class \2/' \
+		${WRKSRC}/FL/Flv_Style.H
 
 post-install: symlink-inc install-doc
 

Cyrille.
-- 
Cyrille Lefevre                 mailto:cyrille.lefevre@laposte.net
Comment 5 Kris Kennaway freebsd_committer freebsd_triage 2003-06-19 09:46:07 UTC 
State Changed
From-To: open->closed

Patch committed, thanks!