Attachment #66728 for bug #98530

View | Details | Raw Unified | Return to bug 98530
Collapse All | Expand All




		jpeg.9:${PORTSDIR}/graphics/jpeg \
		Xft.2:${PORTSDIR}/x11-fonts/libXft

SNAPSHOT=	r5170

OPTIONS=	FLTK_THREADS "Install with threads support" on

CONFLICTS=	fltk-1.* fltk-threads-1.*

LATEST_LINK=	fltk2

USE_BZIP2=	yes

CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbuild-freebsd${OSREL}

DOCSDIR=	${PREFIX}/share/doc/fltk2
PORTDOCS=	*

.include <bsd.port.pre.mk>


post-patch:
	${REINPLACE_CMD} -e 's:%%CXX%%:${CXX}:g' \
	    ${WRKSRC}/fltk2-config.in \
	    ${WRKSRC}/makeinclude.in

post-install:

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (fltk-2.0.x-r4825.tar.bz2) = 37395d18f6cc23d5753c3539288e5f0f	1	MD5 (fltk-2.0.x-r5170.tar.bz2) = 66fcc9c28806dae198a80f32b2368bc5
2	SHA256 (fltk-2.0.x-r4825.tar.bz2) = 0b9a8bd41ea0afb28c4893e3e0a611fd68853e7bd7b3bb5f6c6c1ce4bc1bbabb	2	SHA256 (fltk-2.0.x-r5170.tar.bz2) = 39db34ed0d70f1c08b0334fa436b769057b54d15d70534be8b8643e9a86fc420
3	SIZE (fltk-2.0.x-r4825.tar.bz2) = 2435835	3	SIZE (fltk-2.0.x-r5170.tar.bz2) = 2533439

Lines 1-11 Link Here

(-)files/patch-fltk-config.in (-11 lines)
1	--- ./fltk-config.in.orig Thu Aug 11 02:17:12 2005
2	+++ ./fltk-config.in Sun Apr 2 13:24:34 2006
3	@@ -62,7 +62,7 @@
4	srcdir=@srcdir@
5
6	# compiler names
7	-CXX="@CXX@"
8	+CXX="%%CXX%%"
9	CC="@CC@"
10
11	# post-process command (only needed for MacOS)

Lines 1-11 Link Here

(-)files/patch-fltk-ComboBox.h (-11 lines)
1	--- fltk/ComboBox.h.orig Sun Apr 2 12:05:31 2006
2	+++ fltk/ComboBox.h Sun Apr 2 12:07:16 2006
3	@@ -103,7 +103,7 @@
4	ComboBox *combo_;
5	};
6	ComboInput *input_;
7	-#ifdef _WIN32
8	+#if defined ( _WIN32 ) \|\| defined ( __GNUC__ ) && __GNUC__ < 3
9	public:
10	#endif
11	static void input_callback_(Widget,void);




--- src/Makefile.orig	Fri May 12 00:09:39 2006
+++ src/Makefile	Mon Jun  5 14:44:17 2006
@@ -251,36 +251,27 @@
 	    mkdir $(DESTDIR);                               \
 	  fi                                                \
 	fi
-	$(RMDIR) $(DESTDIR)$(includedir)/fltk
 	$(MKDIR) $(DESTDIR)$(includedir)/fltk
-	$(CP) ../fltk/*.h ../fltk/*.r  $(DESTDIR)$(includedir)/fltk
-	$(CHMOD) 755 $(DESTDIR)$(includedir)/fltk
-	$(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/*
+	$(BSD_INSTALL_DATA) ../fltk/*.h ../fltk/*.r $(DESTDIR)$(includedir)/fltk
 	echo "Installing FLTK1.1 emulation include files in $(includedir)/fltk..."
-	$(RMDIR) $(DESTDIR)$(includedir)/fltk/compat/FL
 	$(MKDIR) $(DESTDIR)$(includedir)/fltk/compat/FL
-	$(CP) ../fltk/compat/FL/*.H ../fltk/compat/FL/*.h  $(DESTDIR)$(includedir)/fltk/compat/FL
-	$(CHMOD) 755 $(DESTDIR)$(includedir)/fltk/compat/FL
-	$(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/compat/FL/*
+	$(BSD_INSTALL_DATA) ../fltk/compat/FL/*.H ../fltk/compat/FL/*.h  $(DESTDIR)$(includedir)/fltk/compat/FL
         ifneq (,$(wildcard ../fltk2-config))
 	echo "Installing fltk2-config in $(bindir)..."
 	$(MKDIR) $(DESTDIR)$(bindir)
-	$(CP) ../fltk2-config $(DESTDIR)$(bindir)
-	$(CHMOD) 755 $(DESTDIR)$(bindir)/fltk2-config
+	$(BSD_INSTALL_SCRIPT) ../fltk2-config $(DESTDIR)$(bindir)
         endif
         ifneq (,$(wildcard ../lib/$(LIBNAME)))
 	echo "Installing static core library in $(libdir)"

-	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
-	$(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
+	$(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
         endif
         ifneq (,$(wildcard ../lib/$(DSONAME)))
 	echo "Installing shared core library in $(libdir)"

 	$(LN) $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
         endif
         ifeq ($(DSONAME), fltk.dll)
-	$(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
+	$(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
         endif
 
 #




--- ./makeinclude.in.orig	Tue Apr 11 00:06:06 2006
+++ ./makeinclude.in	Fri Apr 14 15:42:25 2006
@@ -49,11 +49,11 @@
 
 # compiler names:
 CC		= @CC@
-CXX		= @CXX@
+CXX		= %%CXX%%
 MAKEDEPEND	= @MAKEDEPEND@
 
 # flags for C++ compiler:
-OPTIM		= @OPTIM@

Line 0 Link Here

(-)files/patch-fltk2-config.in (+11 lines)
	1	--- ./fltk2-config.in.orig Tue Apr 11 00:08:47 2006
	2	+++ ./fltk2-config.in Fri Apr 14 15:42:24 2006
	3	@@ -62,7 +62,7 @@
	4	srcdir=@srcdir@
	5
	6	# compiler names
	7	-CXX="@CXX@"
	8	+CXX="%%CXX%%"
	9	CC="@CC@"
	10
	11	# post-process command (only needed for MacOS)




This is a temporary hack to disconnect some demo programs from the
build process. This is because fluid2 wants to establish an X server
connection when building these programs and fails when it cannot
do so.

The issue is known and probably a fluid2 bug, see FLTK2 STR #1302.
--- test/Makefile.orig	Fri May 12 22:16:29 2006
+++ test/Makefile	Mon Jun  5 14:44:17 2006
@@ -142,7 +142,6 @@
 	image$(EXEEXT) \
 	inactive$(EXEEXT) \
 	input$(EXEEXT) \
-	keyboard$(EXEEXT) \
 	label$(EXEEXT) \
 	line_style$(EXEEXT) \
 	list_visuals$(EXEEXT) \
@@ -155,7 +154,6 @@
 	pack$(EXEEXT) \
 	pixmap$(EXEEXT) \
 	progress$(EXEEXT) \
-	radio$(EXEEXT) \
 	qubix$(EXEEXT) \
 	resizable$(EXEEXT) \
 	resizealign$(EXEEXT) \
@@ -169,7 +167,6 @@
 	timer$(EXEEXT) \
 	utf$(EXEEXT) \
 	fullscreen$(EXEEXT) \
-	valuators$(EXEEXT) \
 	list$(EXEEXT) \
 	wizard$(EXEEXT)
 

Lines 1-5 Link Here

(-)files/patch-Makefile (-2 / +2 lines)
1	--- ./Makefile.orig Thu Aug 4 00:08:19 2005	1	--- Makefile.orig Mon Apr 24 12:07:29 2006
2	+++ ./Makefile Sun Apr 2 13:24:34 2006	2	+++ Makefile Mon Jun 5 14:44:17 2006
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@
4	done	4	done
5		5




--- fluid/Makefile.orig	Thu May  4 17:14:35 2006
+++ fluid/Makefile	Mon Jun  5 14:44:17 2006
@@ -128,10 +128,8 @@
 install:
 	echo "Installing FLUID2 in $(bindir)..."
 	-$(MKDIR) $(DESTDIR)$(bindir)
-	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
-	$(STRIP) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+	$(BSD_INSTALL_PROGRAM) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
 	$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
-	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
 
 
 uninstall:

Lines 1-6 Link Here

(-)files/patch-OpenGL-Makefile (-9 / +4 lines)
1	--- ./OpenGL/Makefile.orig Thu Aug 4 00:08:19 2005	1	--- OpenGL/Makefile.orig Tue Apr 25 09:40:40 2006
2	+++ ./OpenGL/Makefile Sun Apr 2 13:24:34 2006	2	+++ OpenGL/Makefile Mon Jun 5 14:44:17 2006
3	@@ -118,19 +118,17 @@	3	@@ -117,15 +117,13 @@
4	ifneq (,$(wildcard ../lib/$(LIBNAME)))	4	ifneq (,$(wildcard ../lib/$(LIBNAME)))
5	echo "Installing static OpenGL library in $(libdir)"	5	echo "Installing static OpenGL library in $(libdir)"
6	$(MKDIR) $(DESTDIR)$(libdir)	6	$(MKDIR) $(DESTDIR)$(libdir)
Lines 17-25 Link Here
17	+ $(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)	17	+ $(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)
18	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)	18	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
19	endif	19	endif
20	ifeq ($(DSONAME), fltk_gl.dll)	20	ifeq ($(DSONAME), fltk2_gl.dll)
21	- $(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
22	+ $(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
23	endif
24
25	#




--- images/Makefile.orig	Tue Apr 25 09:40:40 2006
+++ images/Makefile	Mon Jun  5 14:44:17 2006
@@ -124,8 +124,7 @@
         ifneq (,$(wildcard ../lib/$(LIBNAME)))
 	echo "Installing static images library in $(libdir)"
 	$(MKDIR) $(DESTDIR)$(libdir)
-	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
-	$(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
+	$(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk2_z$(LIBSUFFIX)
 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk2_png$(LIBSUFFIX)
@@ -138,9 +137,8 @@
         ifneq (,$(wildcard ../lib/$(DSONAME)))
 	echo "Installing shared images library in $(libdir)"
 	$(MKDIR) $(DESTDIR)$(libdir)

+	$(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)
 	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
         endif
         ifeq ($(DSONAME), fltk2_images.dll)
-	$(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
+	$(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
         endif
 #
 # Uninstall the libraries...

Lines 1-5 Link Here

(-)files/patch-configure (-2 / +2 lines)
1	--- ./configure.orig Fri Mar 17 06:00:50 2006	1	--- configure.orig Fri Jun 2 06:01:04 2006
2	+++ ./configure Sun Apr 2 13:24:34 2006	2	+++ configure Mon Jun 5 14:44:17 2006
3	@@ -1328,7 +1328,7 @@	3	@@ -1328,7 +1328,7 @@
4	FL_MINOR_VERSION=0	4	FL_MINOR_VERSION=0
5	FL_PATCH_VERSION=0	5	FL_PATCH_VERSION=0




@comment $FreeBSD: ports/x11-toolkits/fltk2/pkg-plist,v 1.1 2006/05/26 16:21:49 pav Exp $
bin/fltk2-config
bin/fluid2
include/fltk/compat/FL/Enumerations.H
include/fltk/compat/FL/Fl.H
include/fltk/compat/FL/Fl_Adjuster.H
include/fltk/compat/FL/Fl_Box.H
include/fltk/compat/FL/Fl_Browser.H
include/fltk/compat/FL/Fl_Button.H
include/fltk/compat/FL/Fl_Chart.H
include/fltk/compat/FL/Fl_Check_Button.H
include/fltk/compat/FL/Fl_Choice.H
include/fltk/compat/FL/Fl_Clock.H
include/fltk/compat/FL/Fl_Color_Chooser.H
include/fltk/compat/FL/Fl_Counter.H
include/fltk/compat/FL/Fl_Dial.H
include/fltk/compat/FL/Fl_Double_Window.H
include/fltk/compat/FL/Fl_File_Chooser.H
include/fltk/compat/FL/Fl_Gl_Window.H
include/fltk/compat/FL/Fl_Group.H
include/fltk/compat/FL/Fl_Hold_Browser.H
include/fltk/compat/FL/Fl_Hor_Slider.H
include/fltk/compat/FL/Fl_Hor_Value_Slider.H
include/fltk/compat/FL/Fl_Input.H
include/fltk/compat/FL/Fl_Int_Input.H
include/fltk/compat/FL/Fl_Light_Button.H
include/fltk/compat/FL/Fl_Menu_.H
include/fltk/compat/FL/Fl_Menu_Bar.H
include/fltk/compat/FL/Fl_Menu_Button.H
include/fltk/compat/FL/Fl_Menu_Item.H
include/fltk/compat/FL/Fl_Output.H
include/fltk/compat/FL/Fl_Overlay_Window.H
include/fltk/compat/FL/Fl_Return_Button.H
include/fltk/compat/FL/Fl_Roller.H
include/fltk/compat/FL/Fl_Scroll.H
include/fltk/compat/FL/Fl_Scrollbar.H
include/fltk/compat/FL/Fl_Select_Browser.H
include/fltk/compat/FL/Fl_Single_Window.H
include/fltk/compat/FL/Fl_Slider.H
include/fltk/compat/FL/Fl_Tabs.H
include/fltk/compat/FL/Fl_Text_Buffer.H
include/fltk/compat/FL/Fl_Text_Editor.H
include/fltk/compat/FL/Fl_Tile.H
include/fltk/compat/FL/Fl_Toggle_Button.H
include/fltk/compat/FL/Fl_Toggle_Light_Button.H
include/fltk/compat/FL/Fl_Valuator.H
include/fltk/compat/FL/Fl_Value_Input.H
include/fltk/compat/FL/Fl_Value_Output.H
include/fltk/compat/FL/Fl_Value_Slider.H
include/fltk/compat/FL/Fl_Widget.H
include/fltk/compat/FL/Fl_Window.H
include/fltk/compat/FL/filename.H
include/fltk/compat/FL/fl_ask.H
include/fltk/compat/FL/fl_draw.H
include/fltk/compat/FL/fl_message.H
include/fltk/compat/FL/forms.H
include/fltk/compat/FL/gl.h
include/fltk/compat/FL/glut.H
include/fltk/compat/FL/math.h
include/fltk/compat/FL/menubar.h
include/fltk/compat/FL/x.H
@dirrm include/fltk/compat/FL
@dirrm include/fltk/compat
include/fltk/Adjuster.h
include/fltk/AlignGroup.h
include/fltk/BarGroup.h

include/fltk/ShapedWindow.h
include/fltk/SharedImage.h
include/fltk/Slider.h
include/fltk/StatusBarGroup.h
include/fltk/StringList.h
include/fltk/Style.h
include/fltk/StyleSet.h

include/fltk/ValueSlider.h
include/fltk/Widget.h
include/fltk/Window.h
include/fltk/WizardGroup.h
include/fltk/WordwrapInput.h
include/fltk/WordwrapOutput.h
include/fltk/ask.h

include/fltk/layout.h
include/fltk/load_plugin.h
include/fltk/mac.h
include/fltk/mac.r
include/fltk/math.h
include/fltk/pnmImage.h
include/fltk/rgbImage.h
include/fltk/run.h
include/fltk/show_colormap.h
include/fltk/string.h
include/fltk/types.h
include/fltk/utf.h
include/fltk/visual.h
include/fltk/win32.h

include/fltk/xbmImage.h
include/fltk/xpmImage.h
@dirrm include/fltk
lib/libfltk2.a
lib/libfltk2_gl.a
lib/libfltk2_images.a

Return to bug 98530

Lines 26-37 Link Here

(-)Makefile (-4 / +3 lines)
26	jpeg.9:${PORTSDIR}/graphics/jpeg \	26	jpeg.9:${PORTSDIR}/graphics/jpeg \
27	Xft.2:${PORTSDIR}/x11-fonts/libXft	27	Xft.2:${PORTSDIR}/x11-fonts/libXft
28		28
29	SNAPSHOT= r4825	29	SNAPSHOT= r5170
30		30
31	OPTIONS= FLTK_THREADS "Install with threads support" on	31	OPTIONS= FLTK_THREADS "Install with threads support" on
32		32
33	CONFLICTS= fltk-1.* fltk-threads-1.*
34
35	LATEST_LINK= fltk2	33	LATEST_LINK= fltk2
36		34
37	USE_BZIP2= yes	35	USE_BZIP2= yes
Lines 52-57 Link Here
52	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	50	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
53	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbuild-freebsd${OSREL}	51	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbuild-freebsd${OSREL}
54		52
		53	DOCSDIR= ${PREFIX}/share/doc/fltk2
55	PORTDOCS= *	54	PORTDOCS= *
56		55
57	.include <bsd.port.pre.mk>	56	.include <bsd.port.pre.mk>
Lines 66-72 Link Here
66		65
67	post-patch:	66	post-patch:
68	${REINPLACE_CMD} -e 's:%%CXX%%:${CXX}:g' \	67	${REINPLACE_CMD} -e 's:%%CXX%%:${CXX}:g' \
69	${WRKSRC}/fltk-config.in \	68	${WRKSRC}/fltk2-config.in \
70	${WRKSRC}/makeinclude.in	69	${WRKSRC}/makeinclude.in
71		70
72	post-install:	71	post-install:

Lines 1-28 Link Here

(-)files/patch-src-Makefile (-22 / +18 lines)
1	--- ./src/Makefile.orig Fri Mar 10 01:02:34 2006	1	--- src/Makefile.orig Fri May 12 00:09:39 2006
2	+++ ./src/Makefile Sun Apr 2 13:24:34 2006	2	+++ src/Makefile Mon Jun 5 14:44:17 2006
3	@@ -254,39 +254,30 @@	3	@@ -251,36 +251,27 @@
4	mkdir $(DESTDIR); \	4	mkdir $(DESTDIR); \
5	fi \	5	fi \
6	fi	6	fi
7	- $(RMDIR) $(DESTDIR)$(includedir)/fltk	7	- $(RMDIR) $(DESTDIR)$(includedir)/fltk
8	$(MKDIR) $(DESTDIR)$(includedir)/fltk	8	$(MKDIR) $(DESTDIR)$(includedir)/fltk
9	- $(CP) ../fltk/*.h $(DESTDIR)$(includedir)/fltk	9	- $(CP) ../fltk/.h ../fltk/.r $(DESTDIR)$(includedir)/fltk
10	- $(CHMOD) 755 $(DESTDIR)$(includedir)/fltk	10	- $(CHMOD) 755 $(DESTDIR)$(includedir)/fltk
11	- $(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/*	11	- $(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/*
12	+ $(BSD_INSTALL_DATA) ../fltk/*.h $(DESTDIR)$(includedir)/fltk	12	+ $(BSD_INSTALL_DATA) ../fltk/.h ../fltk/.r $(DESTDIR)$(includedir)/fltk
13	echo "Installing FLTK1.1 emulation include files in $(includedir)/FL..."	13	echo "Installing FLTK1.1 emulation include files in $(includedir)/fltk..."
14	- $(RMDIR) $(DESTDIR)$(includedir)/FL	14	- $(RMDIR) $(DESTDIR)$(includedir)/fltk/compat/FL
15	$(MKDIR) $(DESTDIR)$(includedir)/FL	15	$(MKDIR) $(DESTDIR)$(includedir)/fltk/compat/FL
16	- $(CP) ../FL/.H ../FL/.h $(DESTDIR)$(includedir)/FL	16	- $(CP) ../fltk/compat/FL/.H ../fltk/compat/FL/.h $(DESTDIR)$(includedir)/fltk/compat/FL
17	- $(CHMOD) 755 $(DESTDIR)$(includedir)/FL	17	- $(CHMOD) 755 $(DESTDIR)$(includedir)/fltk/compat/FL
18	- $(CHMOD) 644 $(DESTDIR)$(includedir)/FL/*	18	- $(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/compat/FL/*
19	+ $(BSD_INSTALL_DATA) ../FL/.H ../FL/.h $(DESTDIR)$(includedir)/FL	19	+ $(BSD_INSTALL_DATA) ../fltk/compat/FL/.H ../fltk/compat/FL/.h $(DESTDIR)$(includedir)/fltk/compat/FL
20	ifneq (,$(wildcard ../fltk-config))	20	ifneq (,$(wildcard ../fltk2-config))
21	echo "Installing fltk-config in $(bindir)..."	21	echo "Installing fltk2-config in $(bindir)..."
22	$(MKDIR) $(DESTDIR)$(bindir)	22	$(MKDIR) $(DESTDIR)$(bindir)
23	- $(CP) ../fltk-config $(DESTDIR)$(bindir)	23	- $(CP) ../fltk2-config $(DESTDIR)$(bindir)
24	- $(CHMOD) 755 $(DESTDIR)$(bindir)/fltk-config	24	- $(CHMOD) 755 $(DESTDIR)$(bindir)/fltk2-config
25	+ $(BSD_INSTALL_SCRIPT) ../fltk-config $(DESTDIR)$(bindir)	25	+ $(BSD_INSTALL_SCRIPT) ../fltk2-config $(DESTDIR)$(bindir)
26	endif	26	endif
27	ifneq (,$(wildcard ../lib/$(LIBNAME)))	27	ifneq (,$(wildcard ../lib/$(LIBNAME)))
28	echo "Installing static core library in $(libdir)"	28	echo "Installing static core library in $(libdir)"
Lines 30-35 Link Here
30	- $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)	30	- $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
31	- $(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)	31	- $(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
32	+ $(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)	32	+ $(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
		33	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
33	endif	34	endif
34	ifneq (,$(wildcard ../lib/$(DSONAME)))	35	ifneq (,$(wildcard ../lib/$(DSONAME)))
35	echo "Installing shared core library in $(libdir)"	36	echo "Installing shared core library in $(libdir)"
Lines 41-48 Link Here
41	$(LN) $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)	42	$(LN) $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
42	endif	43	endif
43	ifeq ($(DSONAME), fltk.dll)	44	ifeq ($(DSONAME), fltk.dll)
44	- $(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
45	+ $(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
46	endif
47
48	#

Lines 1-12 Link Here

(-)files/patch-makeinclude.in (-3 / +3 lines)
1	--- ./makeinclude.in.orig Wed Aug 10 17:43:23 2005	1	--- ./makeinclude.in.orig Tue Apr 11 00:06:06 2006
2	+++ ./makeinclude.in Sun Apr 2 13:24:34 2006	2	+++ ./makeinclude.in Fri Apr 14 15:42:25 2006
3	@@ -49,11 +49,11 @@	3	@@ -49,11 +49,11 @@
4		4
5	# compiler names:	5	# compiler names:
6	CC = @CC@	6	CC = @CC@
7	-CXX = @CXX@	7	-CXX = @CXX@
8	+CXX = %%CXX%%	8	+CXX = %%CXX%%
9	MAKEDEPEND = @MAKEDEPEND@ -Y	9	MAKEDEPEND = @MAKEDEPEND@
10		10
11	# flags for C++ compiler:	11	# flags for C++ compiler:
12	-OPTIM = @OPTIM@	12	-OPTIM = @OPTIM@

Line 0 Link Here

(-)files/patch-test-Makefile (+32 lines)
	1	This is a temporary hack to disconnect some demo programs from the
	2	build process. This is because fluid2 wants to establish an X server
	3	connection when building these programs and fails when it cannot
	4	do so.
	5
	6	The issue is known and probably a fluid2 bug, see FLTK2 STR #1302.
	7	--- test/Makefile.orig Fri May 12 22:16:29 2006
	8	+++ test/Makefile Mon Jun 5 14:44:17 2006
	9	@@ -142,7 +142,6 @@
	10	image$(EXEEXT) \
	11	inactive$(EXEEXT) \
	12	input$(EXEEXT) \
	13	- keyboard$(EXEEXT) \
	14	label$(EXEEXT) \
	15	line_style$(EXEEXT) \
	16	list_visuals$(EXEEXT) \
	17	@@ -155,7 +154,6 @@
	18	pack$(EXEEXT) \
	19	pixmap$(EXEEXT) \
	20	progress$(EXEEXT) \
	21	- radio$(EXEEXT) \
	22	qubix$(EXEEXT) \
	23	resizable$(EXEEXT) \
	24	resizealign$(EXEEXT) \
	25	@@ -169,7 +167,6 @@
	26	timer$(EXEEXT) \
	27	utf$(EXEEXT) \
	28	fullscreen$(EXEEXT) \
	29	- valuators$(EXEEXT) \
	30	list$(EXEEXT) \
	31	wizard$(EXEEXT)
	32

Lines 1-14 Link Here

(-)files/patch-fluid-Makefile (-9 / +9 lines)
1	--- ./fluid/Makefile.orig Wed Aug 10 17:31:43 2005	1	--- fluid/Makefile.orig Thu May 4 17:14:35 2006
2	+++ ./fluid/Makefile Sun Apr 2 13:24:34 2006	2	+++ fluid/Makefile Mon Jun 5 14:44:17 2006
3	@@ -122,10 +122,8 @@	3	@@ -128,10 +128,8 @@
4	install:	4	install:
5	echo "Installing FLUID in $(bindir)..."	5	echo "Installing FLUID2 in $(bindir)..."
6	-$(MKDIR) $(DESTDIR)$(bindir)	6	-$(MKDIR) $(DESTDIR)$(bindir)
7	- $(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)	7	- $(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
8	- $(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT)	8	- $(STRIP) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
9	+ $(BSD_INSTALL_PROGRAM) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)	9	+ $(BSD_INSTALL_PROGRAM) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
10	$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT)	10	$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
11	- $(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT)	11	- $(CHMOD) 755 $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
12		12
13		13
14	uninstall:	14	uninstall:

Lines 1-16 Link Here

(-)files/patch-images-Makefile (-13 / +8 lines)
1	--- ./images/Makefile.orig Fri Aug 12 04:53:31 2005	1	--- images/Makefile.orig Tue Apr 25 09:40:40 2006
2	+++ ./images/Makefile Sun Apr 2 13:24:34 2006	2	+++ images/Makefile Mon Jun 5 14:44:17 2006
3	@@ -120,8 +120,7 @@	3	@@ -124,8 +124,7 @@
4	ifneq (,$(wildcard ../lib/$(LIBNAME)))	4	ifneq (,$(wildcard ../lib/$(LIBNAME)))
5	echo "Installing static images library in $(libdir)"	5	echo "Installing static images library in $(libdir)"
6	$(MKDIR) $(DESTDIR)$(libdir)	6	$(MKDIR) $(DESTDIR)$(libdir)
7	- $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)	7	- $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
8	- $(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)	8	- $(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
9	+ $(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)	9	+ $(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
10	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk_z$(LIBSUFFIX)	10	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
11	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk_png$(LIBSUFFIX)	11	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk2_z$(LIBSUFFIX)
12	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk_jpeg$(LIBSUFFIX)	12	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk2_png$(LIBSUFFIX)
13	@@ -132,13 +131,12 @@	13	@@ -138,9 +137,8 @@
14	ifneq (,$(wildcard ../lib/$(DSONAME)))	14	ifneq (,$(wildcard ../lib/$(DSONAME)))
15	echo "Installing shared images library in $(libdir)"	15	echo "Installing shared images library in $(libdir)"
16	$(MKDIR) $(DESTDIR)$(libdir)	16	$(MKDIR) $(DESTDIR)$(libdir)
Lines 20-28 Link Here
20	+ $(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)	20	+ $(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)
21	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)	21	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
22	endif	22	endif
23	ifeq ($(DSONAME), fltk_images.dll)	23	ifeq ($(DSONAME), fltk2_images.dll)
24	- $(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
25	+ $(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
26	endif
27	#
28	# Uninstall the libraries...

Lines 1-65 Link Here

(-)pkg-plist (-64 / +70 lines)
1	@comment $FreeBSD: ports/x11-toolkits/fltk2/pkg-plist,v 1.1 2006/05/26 16:21:49 pav Exp $	1	@comment $FreeBSD: ports/x11-toolkits/fltk2/pkg-plist,v 1.1 2006/05/26 16:21:49 pav Exp $
2	bin/fltk-config	2	bin/fltk2-config
3	bin/fluid	3	bin/fluid2
4	include/FL/Enumerations.H	4	include/fltk/compat/FL/Enumerations.H
5	include/FL/Fl.H	5	include/fltk/compat/FL/Fl.H
6	include/FL/Fl_Adjuster.H	6	include/fltk/compat/FL/Fl_Adjuster.H
7	include/FL/Fl_Box.H	7	include/fltk/compat/FL/Fl_Box.H
8	include/FL/Fl_Browser.H	8	include/fltk/compat/FL/Fl_Browser.H
9	include/FL/Fl_Button.H	9	include/fltk/compat/FL/Fl_Button.H
10	include/FL/Fl_Chart.H	10	include/fltk/compat/FL/Fl_Chart.H
11	include/FL/Fl_Check_Button.H	11	include/fltk/compat/FL/Fl_Check_Button.H
12	include/FL/Fl_Choice.H	12	include/fltk/compat/FL/Fl_Choice.H
13	include/FL/Fl_Clock.H	13	include/fltk/compat/FL/Fl_Clock.H
14	include/FL/Fl_Color_Chooser.H	14	include/fltk/compat/FL/Fl_Color_Chooser.H
15	include/FL/Fl_Counter.H	15	include/fltk/compat/FL/Fl_Counter.H
16	include/FL/Fl_Dial.H	16	include/fltk/compat/FL/Fl_Dial.H
17	include/FL/Fl_Double_Window.H	17	include/fltk/compat/FL/Fl_Double_Window.H
18	include/FL/Fl_File_Chooser.H	18	include/fltk/compat/FL/Fl_File_Chooser.H
19	include/FL/Fl_Gl_Window.H	19	include/fltk/compat/FL/Fl_Gl_Window.H
20	include/FL/Fl_Group.H	20	include/fltk/compat/FL/Fl_Group.H
21	include/FL/Fl_Hold_Browser.H	21	include/fltk/compat/FL/Fl_Hold_Browser.H
22	include/FL/Fl_Hor_Slider.H	22	include/fltk/compat/FL/Fl_Hor_Slider.H
23	include/FL/Fl_Hor_Value_Slider.H	23	include/fltk/compat/FL/Fl_Hor_Value_Slider.H
24	include/FL/Fl_Input.H	24	include/fltk/compat/FL/Fl_Input.H
25	include/FL/Fl_Int_Input.H	25	include/fltk/compat/FL/Fl_Int_Input.H
26	include/FL/Fl_Light_Button.H	26	include/fltk/compat/FL/Fl_Light_Button.H
27	include/FL/Fl_Menu_.H	27	include/fltk/compat/FL/Fl_Menu_.H
28	include/FL/Fl_Menu_Bar.H	28	include/fltk/compat/FL/Fl_Menu_Bar.H
29	include/FL/Fl_Menu_Button.H	29	include/fltk/compat/FL/Fl_Menu_Button.H
30	include/FL/Fl_Menu_Item.H	30	include/fltk/compat/FL/Fl_Menu_Item.H
31	include/FL/Fl_Output.H	31	include/fltk/compat/FL/Fl_Output.H
32	include/FL/Fl_Overlay_Window.H	32	include/fltk/compat/FL/Fl_Overlay_Window.H
33	include/FL/Fl_Return_Button.H	33	include/fltk/compat/FL/Fl_Return_Button.H
34	include/FL/Fl_Roller.H	34	include/fltk/compat/FL/Fl_Roller.H
35	include/FL/Fl_Scroll.H	35	include/fltk/compat/FL/Fl_Scroll.H
36	include/FL/Fl_Scrollbar.H	36	include/fltk/compat/FL/Fl_Scrollbar.H
37	include/FL/Fl_Select_Browser.H	37	include/fltk/compat/FL/Fl_Select_Browser.H
38	include/FL/Fl_Single_Window.H	38	include/fltk/compat/FL/Fl_Single_Window.H
39	include/FL/Fl_Slider.H	39	include/fltk/compat/FL/Fl_Slider.H
40	include/FL/Fl_Tabs.H	40	include/fltk/compat/FL/Fl_Tabs.H
41	include/FL/Fl_Text_Buffer.H	41	include/fltk/compat/FL/Fl_Text_Buffer.H
42	include/FL/Fl_Text_Editor.H	42	include/fltk/compat/FL/Fl_Text_Editor.H
43	include/FL/Fl_Tile.H	43	include/fltk/compat/FL/Fl_Tile.H
44	include/FL/Fl_Toggle_Button.H	44	include/fltk/compat/FL/Fl_Toggle_Button.H
45	include/FL/Fl_Toggle_Light_Button.H	45	include/fltk/compat/FL/Fl_Toggle_Light_Button.H
46	include/FL/Fl_Valuator.H	46	include/fltk/compat/FL/Fl_Valuator.H
47	include/FL/Fl_Value_Input.H	47	include/fltk/compat/FL/Fl_Value_Input.H
48	include/FL/Fl_Value_Output.H	48	include/fltk/compat/FL/Fl_Value_Output.H
49	include/FL/Fl_Value_Slider.H	49	include/fltk/compat/FL/Fl_Value_Slider.H
50	include/FL/Fl_Widget.H	50	include/fltk/compat/FL/Fl_Widget.H
51	include/FL/Fl_Window.H	51	include/fltk/compat/FL/Fl_Window.H
52	include/FL/filename.H	52	include/fltk/compat/FL/filename.H
53	include/FL/fl_ask.H	53	include/fltk/compat/FL/fl_ask.H
54	include/FL/fl_draw.H	54	include/fltk/compat/FL/fl_draw.H
55	include/FL/fl_message.H	55	include/fltk/compat/FL/fl_message.H
56	include/FL/forms.H	56	include/fltk/compat/FL/forms.H
57	include/FL/gl.h	57	include/fltk/compat/FL/gl.h
58	include/FL/glut.H	58	include/fltk/compat/FL/glut.H
59	include/FL/math.h	59	include/fltk/compat/FL/math.h
60	include/FL/menubar.h	60	include/fltk/compat/FL/menubar.h
61	include/FL/x.H	61	include/fltk/compat/FL/x.H
62	@dirrm include/FL	62	@dirrm include/fltk/compat/FL
		63	@dirrm include/fltk/compat
63	include/fltk/Adjuster.h	64	include/fltk/Adjuster.h
64	include/fltk/AlignGroup.h	65	include/fltk/AlignGroup.h
65	include/fltk/BarGroup.h	66	include/fltk/BarGroup.h
Lines 131-136 Link Here
131	include/fltk/ShapedWindow.h	132	include/fltk/ShapedWindow.h
132	include/fltk/SharedImage.h	133	include/fltk/SharedImage.h
133	include/fltk/Slider.h	134	include/fltk/Slider.h
		135	include/fltk/StatusBarGroup.h
134	include/fltk/StringList.h	136	include/fltk/StringList.h
135	include/fltk/Style.h	137	include/fltk/Style.h
136	include/fltk/StyleSet.h	138	include/fltk/StyleSet.h
Lines 151-156 Link Here
151	include/fltk/ValueSlider.h	153	include/fltk/ValueSlider.h
152	include/fltk/Widget.h	154	include/fltk/Widget.h
153	include/fltk/Window.h	155	include/fltk/Window.h
		156	include/fltk/WizardGroup.h
154	include/fltk/WordwrapInput.h	157	include/fltk/WordwrapInput.h
155	include/fltk/WordwrapOutput.h	158	include/fltk/WordwrapOutput.h
156	include/fltk/ask.h	159	include/fltk/ask.h
Lines 168-178 Link Here
168	include/fltk/layout.h	171	include/fltk/layout.h
169	include/fltk/load_plugin.h	172	include/fltk/load_plugin.h
170	include/fltk/mac.h	173	include/fltk/mac.h
		174	include/fltk/mac.r
171	include/fltk/math.h	175	include/fltk/math.h
		176	include/fltk/pnmImage.h
172	include/fltk/rgbImage.h	177	include/fltk/rgbImage.h
173	include/fltk/run.h	178	include/fltk/run.h
174	include/fltk/show_colormap.h	179	include/fltk/show_colormap.h
175	include/fltk/string.h	180	include/fltk/string.h
		181	include/fltk/types.h
176	include/fltk/utf.h	182	include/fltk/utf.h
177	include/fltk/visual.h	183	include/fltk/visual.h
178	include/fltk/win32.h	184	include/fltk/win32.h
Lines 180-185 Link Here
180	include/fltk/xbmImage.h	186	include/fltk/xbmImage.h
181	include/fltk/xpmImage.h	187	include/fltk/xpmImage.h
182	@dirrm include/fltk	188	@dirrm include/fltk
183	lib/libfltk.a	189	lib/libfltk2.a
184	lib/libfltk_gl.a	190	lib/libfltk2_gl.a
185	lib/libfltk_images.a	191	lib/libfltk2_images.a