- update to new version: 1.6.1 -> 1.6.14; [1]

- add fox-1.2.* to CONFLICTS;               [1]
- move pkgconfigdir from $(libdir)/pkgconfig to $(prefix)/libdata/pkgconfig
  (files/patch-Makefile.in);
- s:INSTALLS_SHLIB:USE_LDCONFIG;
- for OSVERSION<500000 add IGNORE=Does not compile at 4.x;
- add libdata/pkgconfig/fox.pc to pkg-plist.

PR:		102560  [1]
Submitted by:	Gergely CZUCZY <phoemix at harmless.hu>  [1]
Approved by:	alecn2002 at yandex.ru (maintainer timeout 5 weeks)

5 files changed, 27 insertions, 11 deletions

diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 7f1466eb510c..dce334dc3664 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -13,18 +13,18 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		http://fresh.t-systems-sfr.com/unix/src/misc/
 
 MAINTAINER?=	alecn2002@yandex.ru
-COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.2
+COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.6
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-CONFLICTS=	fox-1.0.* fox-1.4.*
+CONFLICTS=	fox-1.0.* fox-1.4.* fox-1.2.*
 LATEST_LINK=	fox16
 
 MAJORVER=	1.6
-SHVER=		1
+SHVER=		14
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
 USE_GNOME=	lthack
@@ -32,7 +32,7 @@ USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=		shutterbug.1 reswrap.1
 
@@ -41,6 +41,10 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+IGNORE=		Does not compile at 4.x
+.endif
+
 ##
 ## Additional Options
 ##
diff --git a/x11-toolkits/fox16/distinfo b/x11-toolkits/fox16/distinfo
index 0c2fcad2d2e5..d915cb5bfa22 100644
--- a/x11-toolkits/fox16/distinfo
+++ b/x11-toolkits/fox16/distinfo
@@ -1,3 +1,3 @@
-MD5 (fox-1.6.1.tar.gz) = 4848b7a1431a8406a316530b0cd04197
-SHA256 (fox-1.6.1.tar.gz) = 0908e92fb215123b82a08d0d0cfb11493ec0d02017cb731f2b271e4856a311b4
-SIZE (fox-1.6.1.tar.gz) = 4331736
+MD5 (fox-1.6.14.tar.gz) = 89d06dc6a732f25ee766bb7a6a985d62
+SHA256 (fox-1.6.14.tar.gz) = ce3185cef8d5a45a05b77854a80cc1e149c9971d1ca974372b52a3902ff87755
+SIZE (fox-1.6.14.tar.gz) = 4331647
diff --git a/x11-toolkits/fox16/files/patch-Makefile.in b/x11-toolkits/fox16/files/patch-Makefile.in
new file mode 100644
index 000000000000..d02eaa4d0dec
--- /dev/null
+++ b/x11-toolkits/fox16/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Oct  2 00:45:41 2006
++++ Makefile.in	Mon Oct  2 00:46:01 2006
+@@ -104,7 +104,7 @@
+ 
+ bin_SCRIPTS = fox-config
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = fox.pc
+ 
+ CLEANFILES = fox.tar.gz
diff --git a/x11-toolkits/fox16/files/patch-configure b/x11-toolkits/fox16/files/patch-configure
index 665af90b7c2d..558b92640b4b 100644
--- a/x11-toolkits/fox16/files/patch-configure
+++ b/x11-toolkits/fox16/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Mon Apr  3 09:41:29 2006
-+++ configure	Mon Apr  3 09:43:03 2006
-@@ -25483,7 +25483,7 @@
+--- configure.fox	Sun Aug 27 10:56:59 2006
++++ configure	Sun Aug 27 10:57:38 2006
+@@ -25479,7 +25479,7 @@
  if test "x$enable_release" = "xyes" ; then
  CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
  if test "${GXX}" = "yes" ; then
--CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+-CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing"
 +CXXFLAGS="${CXXFLAGS} -Wuninitialized"
  fi
  fi
diff --git a/x11-toolkits/fox16/pkg-plist b/x11-toolkits/fox16/pkg-plist
index 052b35100c54..6b4492eac72a 100644
--- a/x11-toolkits/fox16/pkg-plist
+++ b/x11-toolkits/fox16/pkg-plist
@@ -443,3 +443,4 @@ lib/libFOX-%%MAJORVER%%.so.%%SHVER%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/fox-%%MAJORVER%%/chart
 @dirrm include/fox-%%MAJORVER%%
+libdata/pkgconfig/fox.pc