ports/64031: Maintainer update: x11-toolkits/fl_editor ()
Cyrille Lefevre
cyrille.lefevre at laposte.net
Wed Mar 10 07:50:20 UTC 2004
>Number: 64031
>Category: ports
>Synopsis: Maintainer update: x11-toolkits/fl_editor ()
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 09 23:50:19 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sat Jan 31 15:17:05 CET 2004 root at gits:/disk3/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386
>Description:
Makefile
PORTREVISION bumped
MAINTAINER -> ports
CONFIGURE_ARGS : PREFIX -> LOCALBASE
*_SUB added
*_SUBDIR -> &SDIR
port-patch added
pkg-plist
include/FL -> %%INCSDIR%%
share/doc/fl_editor -> %%DOCSDIR%%
files/patch-Makefile.in
updated
patch-src::Fl_ProgressBox.cxx
new files -- int() added
>How-To-Repeat:
n/a
>Fix:
--- /dev/null Wed Mar 10 08:35:28 2004
+++ files/patch-src::Fl_ProgressBox.cxx Wed Mar 10 08:28:17 2004
@@ -0,0 +1,11 @@
+--- src/Fl_ProgressBox.cxx.orig Wed Jun 19 17:51:02 2002
++++ src/Fl_ProgressBox.cxx Wed Mar 10 07:58:26 2004
+@@ -47,7 +47,7 @@
+ fl_draw(buffer, (w() - fl_width(buffer))/2, fl_height() + (((h() - 2*bdy) - fl_height())/2));
+ #else
+ fl_font(this->labelfont(), this->labelsize());
+- fl_draw(buffer, x() + (w() - fl_width(buffer))/2, y() + fl_height() + (((h() - 2*bdy) - fl_height())/2));
++ fl_draw(buffer, int(x() + (w() - fl_width(buffer))/2), int(y() + fl_height() + (((h() - 2*bdy) - fl_height())/2)));
+ #endif
+ }
+ }
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/fl_editor/Makefile,v
retrieving revision 1.7
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.7 Makefile
--- Makefile 4 Feb 2004 05:10:01 -0000 1.7
+++ Makefile 10 Mar 2004 01:18:56 -0000
@@ -7,46 +7,58 @@
PORTNAME= fl_editor
PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://robertk.com/source/fl_editor/
EXTRACT_SUFX= .tgz
-MAINTAINER= cyrille.lefevre at laposte.net
+MAINTAINER= ports at FreeBSD.org
COMMENT= Text Editor Widgets for the Fast Light ToolKit
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
+USE_REINPLACE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --enable-shared --with-fltk=${PREFIX}
+CONFIGURE_ARGS= --enable-shared --with-fltk=${LOCALBASE}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
+PLIST_SUB= INCSDIR="${INCSDIR:S,^${PREFIX}/,,}" \
+ LIBSDIR="${LIBSDIR:S,^${PREFIX}/,,}"
+REINPLACE_SUB= PREFIX=${PREFIX}
+
+INCSDIR= ${PREFIX}/include/FL
+LIBSDIR= ${PREFIX}/lib
+
DOC_FILES= documentation/*.html documentation/*.jpg
INC1_FILES= Fl_Editor.H Fl_FancyEditor.H Fl_FancyMultiEditor.H \
Fl_MultiEditor.H Fl_ProgressBox.H Fl_StatusPanel.H
INC2_FILES= editengine.h editvars.h lists.h stringsup.h wstring.h
-INC_SUBDIR= include/FL
LIB_FILES= libfleditor.so.1
-LIB_SUBDIR= lib
+
+post-patch: patch-inplace
+
+patch-inplace:
+ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${WRKSRC}/Makefile.in
post-install: symlink-inc symlink-lib install-doc
symlink-inc:
.for file in ${INC1_FILES}
- @${LN} -fs ${file} ${PREFIX}/${INC_SUBDIR}/${file:R}.${file:E:L}
+ @${LN} -fs ${file} ${INCSDIR}/${file:R}.${file:E:L}
.endfor
.for file in ${INC2_FILES}
- @${LN} -fs ${file} ${PREFIX}/${INC_SUBDIR}/${file:R}.${file:E:U}
+ @${LN} -fs ${file} ${INCSDIR}/${file:R}.${file:E:U}
.endfor
symlink-lib:
.for file in ${LIB_FILES}
- @${LN} -fs ${file} ${PREFIX}/${LIB_SUBDIR}/${file:R}
+ @${LN} -fs ${file} ${LIBSDIR}/${file:R}
.endfor
install-doc:
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/fl_editor/pkg-plist,v
retrieving revision 1.3
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.3 pkg-plist
--- pkg-plist 14 Feb 2003 09:18:26 -0000 1.3
+++ pkg-plist 9 Mar 2004 17:08:49 -0000
@@ -1,48 +1,48 @@
- at comment $FreeBSD: ports/x11-toolkits/fl_editor/pkg-plist,v 1.2 2001/11/06 11:07:52 petef Exp $
-include/FL/Fl_Editor.H
+ at comment $FreeBSD: ports/x11-toolkits/fl_editor/pkg-plist,v 1.3 2003/02/14 09:18:26 markp Exp $
+%%INCSDIR%%/Fl_Editor.H
@exec ln -fs %f %B/Fl_Editor.h
@unexec rm -f %B/Fl_Editor.h
-include/FL/Fl_FancyEditor.H
+%%INCSDIR%%/Fl_FancyEditor.H
@exec ln -fs %f %B/Fl_FancyEditor.h
@unexec rm -f %B/Fl_FancyEditor.h
-include/FL/Fl_FancyMultiEditor.H
+%%INCSDIR%%/Fl_FancyMultiEditor.H
@exec ln -fs %f %B/Fl_FancyMultiEditor.h
@unexec rm -f %B/Fl_FancyMultiEditor.h
-include/FL/Fl_MultiEditor.H
+%%INCSDIR%%/Fl_MultiEditor.H
@exec ln -fs %f %B/Fl_MultiEditor.h
@unexec rm -f %B/Fl_MultiEditor.h
-include/FL/Fl_ProgressBox.H
+%%INCSDIR%%/Fl_ProgressBox.H
@exec ln -fs %f %B/Fl_ProgressBox.h
@unexec rm -f %B/Fl_ProgressBox.h
-include/FL/Fl_StatusPanel.H
+%%INCSDIR%%/Fl_StatusPanel.H
@exec ln -fs %f %B/Fl_StatusPanel.h
@unexec rm -f %B/Fl_StatusPanel.h
-include/FL/editengine.h
+%%INCSDIR%%/editengine.h
@exec ln -fs %f %B/editengine.H
@unexec rm -f %B/editengine.H
-include/FL/editvars.h
+%%INCSDIR%%/editvars.h
@exec ln -fs %f %B/editvars.H
@unexec rm -f %B/editvars.H
-include/FL/lists.h
+%%INCSDIR%%/lists.h
@exec ln -fs %f %B/lists.H
@unexec rm -f %B/lists.H
-include/FL/stringsup.h
+%%INCSDIR%%/stringsup.h
@exec ln -fs %f %B/stringsup.H
@unexec rm -f %B/stringsup.H
-include/FL/wstring.h
+%%INCSDIR%%/wstring.h
@exec ln -fs %f %B/wstring.H
@unexec rm -f %B/wstring.H
-lib/libfleditor.a
-lib/libfleditor.so.1
+%%LIBSDIR%%/libfleditor.a
+%%LIBSDIR%%/libfleditor.so.1
@exec ln -fs %f %B/libfleditor.so
@unexec rm -f %B/libfleditor.so
-%%PORTDOCS%%share/doc/fl_editor/Fl_Editor.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_Editor.jpg
-%%PORTDOCS%%share/doc/fl_editor/Fl_FancyEditor.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_FancyEditor.jpg
-%%PORTDOCS%%share/doc/fl_editor/Fl_FancyMultiEditor.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_MultiEditor.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_StatusPanel.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_StatusPanel.jpg
-%%PORTDOCS%%share/doc/fl_editor/index.html
-%%PORTDOCS%%@dirrm share/doc/fl_editor
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Editor.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Editor.jpg
+%%PORTDOCS%%%%DOCSDIR%%/Fl_FancyEditor.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_FancyEditor.jpg
+%%PORTDOCS%%%%DOCSDIR%%/Fl_FancyMultiEditor.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_MultiEditor.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_StatusPanel.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_StatusPanel.jpg
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/fl_editor/files/patch-Makefile.in,v
retrieving revision 1.2
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.2 patch-Makefile.in
--- files/patch-Makefile.in 14 Feb 2003 09:18:26 -0000 1.2
+++ files/patch-Makefile.in 10 Mar 2004 01:08:59 -0000
@@ -1,6 +1,18 @@
---- Makefile.in.orig Wed Jan 10 00:11:24 2001
-+++ Makefile.in Sat Aug 18 09:03:39 2001
-@@ -40,14 +40,19 @@
+--- Makefile.in.orig Fri Jun 14 23:12:25 2002
++++ Makefile.in Wed Mar 10 02:08:47 2004
+@@ -23,7 +23,10 @@
+ DSONAME = @DSOLIBNAME@@DSOEXT@
+ GLLIB = @GLLIB@
+ FLTKROOT = @ac_fltk_root@
+-FLTKLIBDIR = @ac_fltk_libraries@
++FLTKLIBDIR = %%PREFIX%%/lib
++FLTKINCDIR = %%PREFIX%%/include/FL
++MKDIR = mkdir -p
++INSTALL_DATA = ${BSD_INSTALL_DATA}
+
+ #
+ # Program options...
+@@ -40,14 +43,19 @@
#
.SILENT:
@@ -22,7 +34,7 @@
#
-@@ -62,7 +67,7 @@
+@@ -62,7 +70,7 @@
# Make all targets...
#
@@ -31,19 +43,20 @@
#
# Remove object and target files...
-@@ -86,7 +91,10 @@
+@@ -86,7 +94,11 @@
install: libfleditor.a
echo "Installing library to $(FLTKLIBDIR)"
- cp libfleditor.a $(FLTKLIBDIR)
-+ rm -f $(FLTKLIBDIR)/libfleditor.*
-+ cp libfleditor.a $(DSONAME) $(FLTKLIBDIR)
-+ echo "Installing headers to $(FLTKROOT)/include/FL"
-+ cp FL/*.[Hh] $(FLTKROOT)/include/FL
++ ${RM} -f $(FLTKLIBDIR)/libfleditor.*
++ ${INSTALL_DATA} libfleditor.a $(DSONAME) $(FLTKLIBDIR)
++ echo "Installing headers to $(FLTKINCDIR)"
++ ${MKDIR} -p $(FLTKINCDIR)
++ ${INSTALL_DATA} FL/*.[Hh] $(FLTKINCDIR)
#
# Make the test programs.
-@@ -122,6 +130,7 @@
+@@ -122,6 +134,7 @@
EDITOR_OBJS = src/Fl_Editor.o src/Fl_FancyEditor.o src/Fl_FancyMultiEditor.o \
src/Fl_MultiEditor.o src/Fl_ProgressBox.o src/Fl_StatusPanel.o \
src/editengine.o src/lists.o src/wstring.o
@@ -51,7 +64,7 @@
libfleditor.a: $(EDITOR_OBJS)
echo Building library $@...
-@@ -129,15 +138,14 @@
+@@ -129,15 +142,14 @@
$(AR) $(ARFLAGS) libfleditor.a $(EDITOR_OBJS)
$(RANLIB) libfleditor.a
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list