5 files changed, 21 insertions, 54 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 60c35bc80daf..0b6715615551 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -19,23 +19,21 @@ DISTNAME=	${PORTNAME}-${VERSION}-source
 MAINTAINER?=	demon@FreeBSD.org
 
 .if defined(WITH_XUNICODE)
-PATCH_VERSION=	20000625
+PATCH_VERSION=	20010114
 _PORTVERSION+=	${VERSION}.${PATCH_VERSION}
 
 PKGNAMESUFFIX=	-xunicode
 
 PATCH_SITES=	http://www.ab.wakwak.com/~tino/jatk/fltk/
-PATCHFILES=	${PORTNAME}-${VERSION}${PKGNAMESUFFIX}-${PATCH_VERSION}.diff.gz
+PATCHFILES=	${PORTNAME}-${VERSION}${PKGNAMESUFFIX}-${PATCH_VERSION}.diff
 PATCH_DIST_STRIP=	-p1
 
-EXTRA_PATCHES=	${PATCHDIR}/xunicode.patch-*
-
-BUILD_DEPENDS=	${X11BASE}/lib/libxunicode.a:${PORTSDIR}/converters/xunicode
+BUILD_DEPENDS=	${X11BASE}/include/xunicode/xunicode.h:${PORTSDIR}/converters/xunicode
 .else
 _PORTVERSION+=	${VERSION}
 .endif
 
-VERSION=	1.0.9
+VERSION=	1.0.10
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
@@ -45,6 +43,11 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 MAN1=		fluid.1
 
+.if defined(WITH_XUNICODE)
+post-extract:
+	cd ${WRKSRC} && ${LN} -s ${X11BASE}/include/xunicode
+.endif
+
 post-install:
 	@ ${INSTALL_MAN} ${WRKSRC}/documentation/fluid.1 \
 		${PREFIX}/man/man1
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index eb3917787909..5055e65dac70 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1,2 +1,2 @@
-MD5 (fltk-1.0.9-source.tar.bz2) = 139c134098128754f706b4f3a905cbc5
-MD5 (fltk-1.0.9-xunicode-20000625.diff.gz) = 4c8282e0287b3fa13b7693b23a436320
+MD5 (fltk-1.0.10-source.tar.bz2) = e76cc38b6c0bdb046a8ac5cd31a7e65e
+MD5 (fltk-1.0.10-xunicode-20010114.diff) = 408ea0af9e4f6e56124744605822c79c
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
index 52ee08048451..400c6d108c96 100644
--- a/x11-toolkits/fltk/files/patch-ab
+++ b/x11-toolkits/fltk/files/patch-ab
@@ -1,5 +1,5 @@
---- configure.orig	Mon Jul  3 17:10:35 2000
-+++ configure	Mon Jul  3 17:12:16 2000
+--- configure.orig	Sat Dec  9 07:00:06 2000
++++ configure	Sat Feb 24 16:02:38 2001
 @@ -837,13 +837,13 @@
    CFLAGS="$ac_save_CFLAGS"
  elif test $ac_cv_prog_cc_g = yes; then
@@ -32,14 +32,14 @@
    else
      CXXFLAGS=
    fi
-@@ -2691,8 +2691,8 @@
-     CFLAGS="-Wall $CFLAGS"
-     CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS"
-     if test -z "$DEBUGFLAG"; then
--        CFLAGS="-O2 -fforce-mem -fforce-addr -fcaller-saves $CFLAGS"
--        CXXFLAGS="-O2 -fforce-mem -fforce-addr -fcaller-saves $CXXFLAGS"
-+        CFLAGS="-fforce-mem -fforce-addr -fcaller-saves $CFLAGS"
-+        CXXFLAGS="-fforce-mem -fforce-addr -fcaller-saves $CXXFLAGS"
+@@ -2750,8 +2750,8 @@
+ 	# WAS: I removed the -fforce-mem, -fforce-addr, -fcaller-saves
+ 	#      They all seemed to make either no difference or enlarged
+ 	#      the code by a few hundred bytes.
+-        CFLAGS="-O2 $CFLAGS"
+-        CXXFLAGS="-O2 $CXXFLAGS"
++#        CFLAGS="-O2 $CFLAGS"
++#        CXXFLAGS="-O2 $CXXFLAGS"
      fi
      if test $PICFLAG = 1; then
      	CFLAGS="-fPIC $CFLAGS"
diff --git a/x11-toolkits/fltk/files/xunicode.patch-aa b/x11-toolkits/fltk/files/xunicode.patch-aa
deleted file mode 100644
index 6093036e590a..000000000000
--- a/x11-toolkits/fltk/files/xunicode.patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- makeinclude.in.orig	Fri Aug 25 14:06:06 2000
-+++ makeinclude.in	Fri Aug 25 14:24:57 2000
-@@ -31,8 +31,11 @@
- libdir		=@libdir@
- srcdir		=@srcdir@
- VPATH		=@srcdir@
--XUNIDIR		=@prefix@/xunicode
--INCLUDE		=-I.. -I$(XUNIDIR)/include
-+XUNIINCDIR	=@prefix@/include/xunicode
-+XUNILIBDIR	=@prefix@/lib
-+INCLUDE		=-I.. -I$(XUNIINCDIR)
-+
-+MAKEFLAGS:=	${MAKEFLAGS} UNILIBDIR="${UNILIBDIR}"
- 
- # compiler names:
- CXX		=@CXX@
-@@ -51,7 +54,7 @@
- DSOCOMMAND	=@DSOCOMMAND@
- 
- # libraries to link with:
--ADDLIBS		=$(XUNIDIR)/lib/libxunicode.a #-lxpg4
-+ADDLIBS		=$(XUNILIBDIR)/libxunicode.a #-lxpg4
- LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ $(ADDLIBS) -lm
- GLDLIBS		=@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ $(ADDLIBS) -lm
- 
diff --git a/x11-toolkits/fltk/files/xunicode.patch-ab b/x11-toolkits/fltk/files/xunicode.patch-ab
deleted file mode 100644
index 8339c3bdf9c1..000000000000
--- a/x11-toolkits/fltk/files/xunicode.patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	Tue Jun  6 06:21:03 2000
-+++ src/Makefile	Fri Aug 25 14:17:18 2000
-@@ -161,7 +161,7 @@
- 
- libfltk.so.1 libfltk.sl.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) -L${XUNILIBDIR} -lxunicode
- 
- clean :
- 	-@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap