Index: head/x11-toolkits/fltk/Makefile
===================================================================
--- head/x11-toolkits/fltk/Makefile	(revision 378717)
+++ head/x11-toolkits/fltk/Makefile	(revision 378718)
@@ -1,52 +1,45 @@
 # Created by: Dima Sivachenko <dima@Chg.RU>
 # $FreeBSD$
 
 PORTNAME=	fltk
 PORTVERSION=	1.3.3
-DISTVERSIONSUFFIX=	-source
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://fltk.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		pkgconfig
 USE_XORG=	xft
 USE_GL=		glu
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-threads \
-		--enable-shared \
-		--enable-xft
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+# -L../src is needed to be able to build new version with older one installed
+LDFLAGS+=	-L../src -L${LOCALBASE}/lib
 
-PORTDOCS=	*
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/.SILENT/s|^|#| ; \
-		 /echo /s|^|#|' ${WRKSRC}/makeinclude.in
-	@${REINPLACE_CMD} -e \
-		'/cat[13]/s|^|#|' ${WRKSRC}/documentation/Makefile
-	@${REINPLACE_CMD} -e \
-		's|"/etc/fltk/"|"${ETCDIR}/"|' ${WRKSRC}/src/Fl_Preferences.cxx
-
-post-install:
-	@(cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fluid
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfltk*.so.[0-9]*
+post-patch: .SILENT
+	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
+	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
+		${WRKSRC}/src/Fl_Preferences.cxx
+	${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \
+		${WRKSRC}/test/Makefile
+	${REINPLACE_CMD} -E '/^INSTALL_(BIN|LIB)/s,-m,${STRIP} &, ; \
+		s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/fltk/files/patch-configure
===================================================================
--- head/x11-toolkits/fltk/files/patch-configure	(revision 378717)
+++ head/x11-toolkits/fltk/files/patch-configure	(revision 378718)
@@ -1,11 +1,29 @@
 --- configure.orig	2011-08-31 09:14:41.000000000 +0200
 +++ configure	2011-08-31 09:14:54.000000000 +0200
 @@ -7362,7 +7362,7 @@
  	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
  	CFLAGS="$CFLAGS $X_CFLAGS"
  	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 -	LDFLAGS="$X_LIBS $LDFLAGS"
 +	LDFLAGS="$LDFLAGS $X_LIBS"
  	DSOFLAGS="$X_LIBS $DSOFLAGS"
  	$as_echo "#define USE_X11 1" >>confdefs.h
  
+@@ -8137,17 +8137,10 @@
+ 	#       Don't use -fforce-mem, -fforce-addr, or -fcaller-saves.
+ 	#       They all seem to make either no difference or enlarge
+ 	#       the code by a few hundred bytes.
+-        #
+-	#       "-Os" seems to be the best compromise between speed and
+-	#       code size.  "-O3" and higher seem to make no effective
+-	#       difference in the speed of the code, but does bloat the
+-	#       library 10+%.
+ 	#
+ 
+         if test "x$with_optim" != x; then
+ 	    OPTIM="$with_optim $OPTIM"
+-	else
+-            OPTIM="-Os $OPTIM"
+ 	fi
+     fi
+ 
Index: head/x11-toolkits/fltk/files/patch-documentation_Makefile
===================================================================
--- head/x11-toolkits/fltk/files/patch-documentation_Makefile	(nonexistent)
+++ head/x11-toolkits/fltk/files/patch-documentation_Makefile	(revision 378718)
@@ -0,0 +1,23 @@
+--- documentation/Makefile.orig	2011-08-27 01:33:42.000000000 +0000
++++ documentation/Makefile	2011-08-27 01:39:59.000000000 +0000
+@@ -73,7 +73,7 @@
+ 
+ install: $(MANPAGES)
+ 	echo "Installing documentation files in $(DESTDIR)$(docdir) ..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
++#	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
+ 	if test -f html/index.html ; then \
+ 	  for file in html/* ; do \
+ 		$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
+@@ -84,11 +84,6 @@
+ 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ 	fi
+ 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1

Property changes on: head/x11-toolkits/fltk/files/patch-documentation_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property