6 files changed, 261 insertions, 257 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 07ea0022d86a..5ed1409b4680 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	fltk
 PORTVERSION=	${VERSION}
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
-		ftp://ftp.chg.ru/pub/X11/fltk/${VERSION}/ \
-		ftp://ftp2.easysw.com/pub/fltk/${VERSION}/ \
-		ftp://ftp.northamerica.net/pub/ESP/fltk/${VERSION}/ \
-		ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERSION}/ \
-		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERSION}/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${VERSION}-source
 
 MAINTAINER?=	demon@FreeBSD.org
@@ -29,17 +25,19 @@ CPPFLAGS+=	"${PTHREAD_CFLAGS}"
 LDFLAGS+=	"${PTHREAD_LIBS}"
 .endif
 
-VERSION=	1.1.4
+VERSION=	1.1.6
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-shared --enable-xft
 # configure ignores ${CXX} and keeps on linking C++ code with ${CC}
 CONFIGURE_ENV+=	CC="${CXX}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
+USE_REINPLACE=	yes
 
 MAN1=		fluid.1 fltk-config.1
 MAN3=		fltk.3
@@ -48,4 +46,11 @@ pre-everything::
 	@${ECHO_MSG} "===>  You can enable threads support by defining WITH_THREADS"
 	@${ECHO_MSG} "===>"
 
+pre-configure:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|%%DOCS%%|#|' ${WRKSRC}/documentation/Makefile
+.else
+	@${REINPLACE_CMD} -e 's|%%DOCS%%||' ${WRKSRC}/documentation/Makefile
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index c92300d97206..c1d15a631525 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1,2 +1,2 @@
-MD5 (fltk-1.1.4-source.tar.bz2) = 06ce1d3def2df35525592746faccbf98
-SIZE (fltk-1.1.4-source.tar.bz2) = 1305766
+MD5 (fltk-1.1.6-source.tar.bz2) = 95d340977d13edea12e98d787a668b32
+SIZE (fltk-1.1.6-source.tar.bz2) = 1898966
diff --git a/x11-toolkits/fltk/files/patch-documentation-Makefile b/x11-toolkits/fltk/files/patch-documentation-Makefile
index a5f8a05176c1..2578751d167f 100644
--- a/x11-toolkits/fltk/files/patch-documentation-Makefile
+++ b/x11-toolkits/fltk/files/patch-documentation-Makefile
@@ -1,17 +1,26 @@
---- documentation/Makefile.orig	Sun Jan  5 15:43:13 2003
-+++ documentation/Makefile	Sun Jan  5 15:43:32 2003
-@@ -230,14 +230,6 @@
- 	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(docdir)
- 	$(CHMOD) 644 $(docdir)/*
- 	echo "Installing man pages in $(mandir)..."
--	-$(MKDIR) $(mandir)/cat1
--	$(CP) fluid.$(CAT1EXT) $(mandir)/cat1
--	$(CHMOD) 644 $(mandir)/cat1/fluid.$(CAT1EXT)
--	$(CP) fltk-config.$(CAT1EXT) $(mandir)/cat1
--	$(CHMOD) 644 $(mandir)/cat1/fltk-config.$(CAT1EXT)
--	-$(MKDIR) $(mandir)/cat3
--	$(CP) fltk.$(CAT3EXT) $(mandir)/cat3
--	$(CHMOD) 644 $(mandir)/cat3/fltk.$(CAT3EXT)
- 	-$(MKDIR) $(mandir)/man1
- 	$(CP) fluid.man $(mandir)/man1/fluid.1
- 	$(CHMOD) 644 $(mandir)/man1/fluid.1
+--- documentation/Makefile.orig	Mon Oct 18 22:22:22 2004
++++ documentation/Makefile	Fri Jan 28 23:16:46 2005
+@@ -225,19 +225,11 @@
+ docdir = $(datadir)/doc/fltk
+ 
+ install: $(MANPAGES)
+-	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
+-	-$(MKDIR) $(DESTDIR)$(docdir)
+-	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
+-	$(CHMOD) 644 $(DESTDIR)$(docdir)/*
++%%DOCS%%	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
++%%DOCS%%	-$(MKDIR) $(DESTDIR)$(docdir)
++%%DOCS%%	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
++%%DOCS%%	$(CHMOD) 644 $(DESTDIR)$(docdir)/*
+ 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
+-	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
+-	$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+-	$(CP) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+-	-$(MKDIR) $(DESTDIR)$(mandir)/cat3
+-	$(CP) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+-	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ 	-$(MKDIR) $(DESTDIR)$(mandir)/man1
+ 	$(CP) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1
diff --git a/x11-toolkits/fltk/files/patch-makeinclude.in b/x11-toolkits/fltk/files/patch-makeinclude.in
deleted file mode 100644
index 9f8a4f154a07..000000000000
--- a/x11-toolkits/fltk/files/patch-makeinclude.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- makeinclude.in.orig	Sun Jan  5 14:57:05 2003
-+++ makeinclude.in	Sun Jan  5 14:57:31 2003
-@@ -53,8 +53,8 @@
- 
- # flags for C++ compiler:
- OPTIM		= @OPTIM@
--CFLAGS		= $(OPTIM) @CFLAGS@
--CXXFLAGS	= $(OPTIM) @CXXFLAGS@
-+CFLAGS		= $(OPTIM) @CFLAGS@ @CPPFLAGS@
-+CXXFLAGS	= $(OPTIM) @CXXFLAGS@ @CPPFLAGS@
- 
- # program to make the archive:
- LIBNAME		= @LIBNAME@
diff --git a/x11-toolkits/fltk/files/patch-src-Makefile b/x11-toolkits/fltk/files/patch-src-Makefile
index 4ebcf5e60aa9..7780b1d005ec 100644
--- a/x11-toolkits/fltk/files/patch-src-Makefile
+++ b/x11-toolkits/fltk/files/patch-src-Makefile
@@ -1,6 +1,6 @@
---- src/Makefile.orig	Tue Sep  9 11:31:56 2003
-+++ src/Makefile	Tue Sep  9 11:34:37 2003
-@@ -198,11 +198,11 @@
+--- src/Makefile.orig	Sat Nov 20 04:19:58 2004
++++ src/Makefile	Fri Jan 28 22:57:03 2005
+@@ -199,11 +199,11 @@
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
  
@@ -8,13 +8,13 @@
 +libfltk.so.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(OBJECTS)
- 	-$(RM) libfltk.so
+ 	$(RM) libfltk.so
 -	$(LN) libfltk.so.1.1 libfltk.so
 +	$(LN) libfltk.so.1 libfltk.so
  
  libfltk.sl.1.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
-@@ -234,11 +234,11 @@
+@@ -235,11 +235,11 @@
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
  
@@ -22,13 +22,13 @@
 +libfltk_forms.so.1: $(FLOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
- 	-$(RM) libfltk_forms.so
+ 	$(RM) libfltk_forms.so
 -	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
 +	$(LN) libfltk_forms.so.1 libfltk_forms.so
  
  libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -270,11 +270,11 @@
+@@ -271,11 +271,11 @@
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
  
@@ -36,13 +36,13 @@
 +libfltk_gl.so.1: $(GLOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
- 	-$(RM) libfltk_gl.so
+ 	$(RM) libfltk_gl.so
 -	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
 +	$(LN) libfltk_gl.so.1 libfltk_gl.so
  
  libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -306,11 +306,11 @@
+@@ -307,13 +307,13 @@
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
  
@@ -50,73 +50,76 @@
 +libfltk_images.so.1: $(IMGOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
- 	-$(RM) libfltk_images.so
+ 	$(RM) libfltk_images.so
 -	$(LN) libfltk_images.so.1.1 libfltk_images.so
 +	$(LN) libfltk_images.so.1 libfltk_images.so
  
- libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
+-libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
++libfltk_images.sl.1: $(IMGOBJECTS) libfltk.sl.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -428,11 +428,11 @@
- 		$(RANLIB) $(libdir)/$(GLLIBNAME); \
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
+ 	$(RM) libfltk_images.sl
+@@ -429,11 +429,11 @@
+ 		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
  	fi
- 	$(RANLIB) $(libdir)/$(IMGLIBNAME)
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
 -	if test x$(DSONAME) = xlibfltk.so.1.1; then\
 +	if test x$(DSONAME) = xlibfltk.so.1; then\
- 		$(RM) $(libdir)/libfltk.so*;\
--		$(CP) libfltk.so.1.1 $(libdir); \
--		$(CHMOD) 755 $(libdir)/libfltk.so.1.1; \
--		$(LN) libfltk.so.1.1 $(libdir)/libfltk.so;\
-+		$(CP) libfltk.so.1 $(libdir); \
-+		$(CHMOD) 755 $(libdir)/libfltk.so.1; \
-+		$(LN) libfltk.so.1 $(libdir)/libfltk.so;\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+-		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+-		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1.1; \
+-		$(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\
++		$(CP) libfltk.so.1 $(DESTDIR)$(libdir); \
++		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1; \
++		$(LN) libfltk.so.1 $(DESTDIR)$(libdir)/libfltk.so;\
  	fi
  	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
- 		$(RM) $(libdir)/libfltk.sl*;\
-@@ -451,11 +451,11 @@
- 		$(CP) libfltk_s.a $(libdir); \
- 		$(CHMOD) 755 $(libdir)/libfltk_s.a; \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
+@@ -452,11 +452,11 @@
+ 		$(CP) libfltk_s.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_s.a; \
  	fi
 -	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
 +	if test x$(FLDSONAME) = xlibfltk_forms.so.1; then\
- 		$(RM) $(libdir)/libfltk_forms.so*;\
--		$(CP) libfltk_forms.so.1.1 $(libdir); \
--		$(CHMOD) 755 $(libdir)/libfltk_forms.so.1.1; \
--		$(LN) libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
-+		$(CP) libfltk_forms.so.1 $(libdir); \
-+		$(CHMOD) 755 $(libdir)/libfltk_forms.so.1; \
-+		$(LN) libfltk_forms.so.1 $(libdir)/libfltk_forms.so;\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
+-		$(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
+-		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \
+-		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
++		$(CP) libfltk_forms.so.1 $(DESTDIR)$(libdir); \
++		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1; \
++		$(LN) libfltk_forms.so.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
  	fi
  	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
- 		$(RM) $(libdir)/libfltk_forms.sl*;\
-@@ -474,11 +474,11 @@
- 		$(CP) libfltk_forms_s.a $(libdir); \
- 		$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+@@ -475,11 +475,11 @@
+ 		$(CP) libfltk_forms_s.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.a; \
  	fi
 -	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
 +	if test x$(GLDSONAME) = xlibfltk_gl.so.1; then\
- 		$(RM) $(libdir)/libfltk_gl.so*;\
--		$(CP) libfltk_gl.so.1.1 $(libdir); \
--		$(CHMOD) 755 $(libdir)/libfltk_gl.so.1.1; \
--		$(LN) libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\
-+		$(CP) libfltk_gl.so.1 $(libdir); \
-+		$(CHMOD) 755 $(libdir)/libfltk_gl.so.1; \
-+		$(LN) libfltk_gl.so.1 $(libdir)/libfltk_gl.so;\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
+-		$(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \
+-		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1.1; \
+-		$(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\
++		$(CP) libfltk_gl.so.1 $(DESTDIR)$(libdir); \
++		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1; \
++		$(LN) libfltk_gl.so.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\
  	fi
  	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
- 		$(RM) $(libdir)/libfltk_gl.sl*;\
-@@ -497,11 +497,11 @@
- 		$(CP) libfltk_gl_s.a $(libdir); \
- 		$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
+@@ -498,11 +498,11 @@
+ 		$(CP) libfltk_gl_s.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.a; \
  	fi
 -	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
 +	if test x$(IMGDSONAME) = xlibfltk_images.so.1; then\
- 		$(RM) $(libdir)/libfltk_images.so*;\
--		$(CP) libfltk_images.so.1.1 $(libdir); \
--		$(CHMOD) 755 $(libdir)/libfltk_images.so.1.1; \
--		$(LN) libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\
-+		$(CP) libfltk_images.so.1 $(libdir); \
-+		$(CHMOD) 755 $(libdir)/libfltk_images.so.1; \
-+		$(LN) libfltk_images.so.1 $(libdir)/libfltk_images.so;\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+-		$(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \
+-		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1.1; \
+-		$(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so;\
++		$(CP) libfltk_images.so.1 $(DESTDIR)$(libdir); \
++		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1; \
++		$(LN) libfltk_images.so.1 $(DESTDIR)$(libdir)/libfltk_images.so;\
  	fi
  	if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
- 		$(RM) $(libdir)/libfltk_images.sl*;\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index 5d02391c133c..602af50a2587 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -251,167 +251,167 @@ lib/libfltk_images.so.1
 lib/libfltk_forms.a
 lib/libfltk_forms.so
 lib/libfltk_forms.so.1
-share/doc/fltk/FL.gif
-share/doc/fltk/Fl.html
-share/doc/fltk/Fl_Adjuster.html
-share/doc/fltk/Fl_BMP_Image.html
-share/doc/fltk/Fl_Bitmap.html
-share/doc/fltk/Fl_Box.html
-share/doc/fltk/Fl_Browser.html
-share/doc/fltk/Fl_Browser_.html
-share/doc/fltk/Fl_Button.html
-share/doc/fltk/Fl_Chart.html
-share/doc/fltk/Fl_Check_Browser.html
-share/doc/fltk/Fl_Check_Button.gif
-share/doc/fltk/Fl_Check_Button.html
-share/doc/fltk/Fl_Choice.html
-share/doc/fltk/Fl_Clock.html
-share/doc/fltk/Fl_Color_Chooser.html
-share/doc/fltk/Fl_Counter.html
-share/doc/fltk/Fl_Dial.html
-share/doc/fltk/Fl_Double_Window.html
-share/doc/fltk/Fl_End.html
-share/doc/fltk/Fl_File_Browser.html
-share/doc/fltk/Fl_File_Chooser.html
-share/doc/fltk/Fl_File_Chooser.jpg
-share/doc/fltk/Fl_File_Icon.html
-share/doc/fltk/Fl_File_Input.gif
-share/doc/fltk/Fl_File_Input.html
-share/doc/fltk/Fl_Float_Input.html
-share/doc/fltk/Fl_Free.html
-share/doc/fltk/Fl_GIF_Image.html
-share/doc/fltk/Fl_Gl_Window.html
-share/doc/fltk/Fl_Group.html
-share/doc/fltk/Fl_Help_Dialog.gif
-share/doc/fltk/Fl_Help_Dialog.html
-share/doc/fltk/Fl_Help_View.html
-share/doc/fltk/Fl_Hold_Browser.html
-share/doc/fltk/Fl_Image.html
-share/doc/fltk/Fl_Input.html
-share/doc/fltk/Fl_Input_.html
-share/doc/fltk/Fl_Int_Input.html
-share/doc/fltk/Fl_JPEG_Image.html
-share/doc/fltk/Fl_Light_Button.gif
-share/doc/fltk/Fl_Light_Button.html
-share/doc/fltk/Fl_Menu_.html
-share/doc/fltk/Fl_Menu_Bar.html
-share/doc/fltk/Fl_Menu_Button.html
-share/doc/fltk/Fl_Menu_Item.html
-share/doc/fltk/Fl_Menu_Window.html
-share/doc/fltk/Fl_Multi_Browser.html
-share/doc/fltk/Fl_Multiline_Input.html
-share/doc/fltk/Fl_Multiline_Output.html
-share/doc/fltk/Fl_Output.html
-share/doc/fltk/Fl_Overlay_Window.html
-share/doc/fltk/Fl_PNG_Image.html
-share/doc/fltk/Fl_PNM_Image.html
-share/doc/fltk/Fl_Pack.html
-share/doc/fltk/Fl_Pixmap.html
-share/doc/fltk/Fl_Positioner.html
-share/doc/fltk/Fl_Preferences.html
-share/doc/fltk/Fl_Progress.html
-share/doc/fltk/Fl_RGB_Image.html
-share/doc/fltk/Fl_Repeat_Button.html
-share/doc/fltk/Fl_Return_Button.gif
-share/doc/fltk/Fl_Return_Button.html
-share/doc/fltk/Fl_Roller.gif
-share/doc/fltk/Fl_Roller.html
-share/doc/fltk/Fl_Round_Button.gif
-share/doc/fltk/Fl_Round_Button.html
-share/doc/fltk/Fl_Scroll.gif
-share/doc/fltk/Fl_Scroll.html
-share/doc/fltk/Fl_Scrollbar.html
-share/doc/fltk/Fl_Secret_Input.html
-share/doc/fltk/Fl_Select_Browser.html
-share/doc/fltk/Fl_Shared_Image.html
-share/doc/fltk/Fl_Single_Window.html
-share/doc/fltk/Fl_Slider.html
-share/doc/fltk/Fl_Tabs.html
-share/doc/fltk/Fl_Text_Buffer.html
-share/doc/fltk/Fl_Text_Display.html
-share/doc/fltk/Fl_Text_Editor.html
-share/doc/fltk/Fl_Tile.gif
-share/doc/fltk/Fl_Tile.html
-share/doc/fltk/Fl_Tiled_Image.html
-share/doc/fltk/Fl_Timer.html
-share/doc/fltk/Fl_Tooltip.html
-share/doc/fltk/Fl_Valuator.html
-share/doc/fltk/Fl_Value_Input.gif
-share/doc/fltk/Fl_Value_Input.html
-share/doc/fltk/Fl_Value_Output.gif
-share/doc/fltk/Fl_Value_Output.html
-share/doc/fltk/Fl_Value_Slider.html
-share/doc/fltk/Fl_Widget.html
-share/doc/fltk/Fl_Window.html
-share/doc/fltk/Fl_Wizard.html
-share/doc/fltk/Fl_XBM_Image.html
-share/doc/fltk/Fl_XPM_Image.html
-share/doc/fltk/adjuster1.gif
-share/doc/fltk/basics.html
-share/doc/fltk/boxtypes.gif
-share/doc/fltk/buttons.gif
-share/doc/fltk/charts.gif
-share/doc/fltk/choice.gif
-share/doc/fltk/clock.gif
-share/doc/fltk/common.html
-share/doc/fltk/counter.gif
-share/doc/fltk/cubeview.gif
-share/doc/fltk/dial.gif
-share/doc/fltk/drawing.html
-share/doc/fltk/editor-replace.gif
-share/doc/fltk/editor.gif
-share/doc/fltk/editor.html
-share/doc/fltk/enumerations.html
-share/doc/fltk/events.html
-share/doc/fltk/fl_alert.gif
-share/doc/fltk/fl_ask.gif
-share/doc/fltk/fl_choice.gif
-share/doc/fltk/fl_color_chooser.jpg
-share/doc/fltk/fl_input.gif
-share/doc/fltk/fl_message.gif
-share/doc/fltk/fl_password.gif
-share/doc/fltk/fl_show_colormap.gif
-share/doc/fltk/fluid-catgets.gif
-share/doc/fltk/fluid-gettext.gif
-share/doc/fltk/fluid-org.gif
-share/doc/fltk/fluid.html
-share/doc/fltk/fluid1.gif
-share/doc/fltk/fluid2.gif
-share/doc/fltk/fluid3-cxx.gif
-share/doc/fltk/fluid3-gui.gif
-share/doc/fltk/fluid3-style.gif
-share/doc/fltk/fluid4.gif
-share/doc/fltk/fluid_prefs.gif
-share/doc/fltk/fluid_widget_cxx.gif
-share/doc/fltk/fluid_widget_gui.gif
-share/doc/fltk/fluid_widget_style.gif
-share/doc/fltk/forms.html
-share/doc/fltk/functions.html
-share/doc/fltk/glut.html
-share/doc/fltk/hello.C.gif
-share/doc/fltk/index.html
-share/doc/fltk/intro.html
-share/doc/fltk/license.html
-share/doc/fltk/menu.gif
-share/doc/fltk/menu_button.gif
-share/doc/fltk/menubar.gif
-share/doc/fltk/migration.html
-share/doc/fltk/opengl.html
-share/doc/fltk/osissues.html
-share/doc/fltk/positioner.gif
-share/doc/fltk/preface.html
-share/doc/fltk/resizebox1.gif
-share/doc/fltk/resizebox2.gif
-share/doc/fltk/round_clock.gif
-share/doc/fltk/scrollbar.gif
-share/doc/fltk/slider.gif
-share/doc/fltk/subclassing.html
-share/doc/fltk/symbols.gif
-share/doc/fltk/tabs.gif
-share/doc/fltk/text.gif
-share/doc/fltk/valuators.gif
-share/doc/fltk/value_slider.gif
-share/doc/fltk/widgets.html
+%%PORTDOCS%%%%DOCSDIR%%/FL.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Adjuster.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_BMP_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Bitmap.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Box.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Browser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Browser_.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Chart.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Check_Browser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Check_Button.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Check_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Choice.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Clock.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Color_Chooser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Counter.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Dial.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Double_Window.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_End.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_File_Browser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_File_Chooser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_File_Chooser.jpg
+%%PORTDOCS%%%%DOCSDIR%%/Fl_File_Icon.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_File_Input.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_File_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Float_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Free.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_GIF_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Gl_Window.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Group.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Help_Dialog.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Help_Dialog.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Help_View.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Hold_Browser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Input_.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Int_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_JPEG_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Light_Button.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Light_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Menu_.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Menu_Bar.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Menu_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Menu_Item.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Menu_Window.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Multi_Browser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Multiline_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Multiline_Output.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Output.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Overlay_Window.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_PNG_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_PNM_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Pack.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Pixmap.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Positioner.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Progress.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_RGB_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Repeat_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Return_Button.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Return_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Roller.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Roller.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Round_Button.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Round_Button.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Scroll.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Scroll.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Scrollbar.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Secret_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Select_Browser.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Shared_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Single_Window.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Slider.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Tabs.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Text_Buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Text_Display.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Text_Editor.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Tile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Tile.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Tiled_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Timer.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Tooltip.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Valuator.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Value_Input.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Value_Input.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Value_Output.gif
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Value_Output.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Value_Slider.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Widget.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Window.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Wizard.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_XBM_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_XPM_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/adjuster1.gif
+%%PORTDOCS%%%%DOCSDIR%%/basics.html
+%%PORTDOCS%%%%DOCSDIR%%/boxtypes.gif
+%%PORTDOCS%%%%DOCSDIR%%/buttons.gif
+%%PORTDOCS%%%%DOCSDIR%%/charts.gif
+%%PORTDOCS%%%%DOCSDIR%%/choice.gif
+%%PORTDOCS%%%%DOCSDIR%%/clock.gif
+%%PORTDOCS%%%%DOCSDIR%%/common.html
+%%PORTDOCS%%%%DOCSDIR%%/counter.gif
+%%PORTDOCS%%%%DOCSDIR%%/cubeview.gif
+%%PORTDOCS%%%%DOCSDIR%%/dial.gif
+%%PORTDOCS%%%%DOCSDIR%%/drawing.html
+%%PORTDOCS%%%%DOCSDIR%%/editor-replace.gif
+%%PORTDOCS%%%%DOCSDIR%%/editor.gif
+%%PORTDOCS%%%%DOCSDIR%%/editor.html
+%%PORTDOCS%%%%DOCSDIR%%/enumerations.html
+%%PORTDOCS%%%%DOCSDIR%%/events.html
+%%PORTDOCS%%%%DOCSDIR%%/fl_alert.gif
+%%PORTDOCS%%%%DOCSDIR%%/fl_ask.gif
+%%PORTDOCS%%%%DOCSDIR%%/fl_choice.gif
+%%PORTDOCS%%%%DOCSDIR%%/fl_color_chooser.jpg
+%%PORTDOCS%%%%DOCSDIR%%/fl_input.gif
+%%PORTDOCS%%%%DOCSDIR%%/fl_message.gif
+%%PORTDOCS%%%%DOCSDIR%%/fl_password.gif
+%%PORTDOCS%%%%DOCSDIR%%/fl_show_colormap.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid-catgets.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid-gettext.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid-org.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid.html
+%%PORTDOCS%%%%DOCSDIR%%/fluid1.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid2.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid3-cxx.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid3-gui.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid3-style.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid4.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid_prefs.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid_widget_cxx.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid_widget_gui.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid_widget_style.gif
+%%PORTDOCS%%%%DOCSDIR%%/forms.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/glut.html
+%%PORTDOCS%%%%DOCSDIR%%/hello.C.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/menu.gif
+%%PORTDOCS%%%%DOCSDIR%%/menu_button.gif
+%%PORTDOCS%%%%DOCSDIR%%/menubar.gif
+%%PORTDOCS%%%%DOCSDIR%%/migration.html
+%%PORTDOCS%%%%DOCSDIR%%/opengl.html
+%%PORTDOCS%%%%DOCSDIR%%/osissues.html
+%%PORTDOCS%%%%DOCSDIR%%/positioner.gif
+%%PORTDOCS%%%%DOCSDIR%%/preface.html
+%%PORTDOCS%%%%DOCSDIR%%/resizebox1.gif
+%%PORTDOCS%%%%DOCSDIR%%/resizebox2.gif
+%%PORTDOCS%%%%DOCSDIR%%/round_clock.gif
+%%PORTDOCS%%%%DOCSDIR%%/scrollbar.gif
+%%PORTDOCS%%%%DOCSDIR%%/slider.gif
+%%PORTDOCS%%%%DOCSDIR%%/subclassing.html
+%%PORTDOCS%%%%DOCSDIR%%/symbols.gif
+%%PORTDOCS%%%%DOCSDIR%%/tabs.gif
+%%PORTDOCS%%%%DOCSDIR%%/text.gif
+%%PORTDOCS%%%%DOCSDIR%%/valuators.gif
+%%PORTDOCS%%%%DOCSDIR%%/value_slider.gif
+%%PORTDOCS%%%%DOCSDIR%%/widgets.html
 @dirrm include/FL
 include/Fl
-@dirrm share/doc/fltk
+%%PORTDOCS%%@dirrm %%DOCSDIR%%