Update to 1.20

Submitted by:	maintainer

6 files changed, 101 insertions, 8 deletions

diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 5206ffa6cbb6..abad5953cfe4 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quat
-PORTVERSION=	1.11
+PORTVERSION=	1.20
 CATEGORIES=	graphics
 MASTER_SITES=   http://www.physcip.uni-stuttgart.de/phy11733/download/
 PKGNAMESUFFIX=	-gui
@@ -20,12 +20,33 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -L${X11BASE}/lib" LIBS="-lXext -lGL"
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -L${X11BASE}/lib" \
+		LIBS="-lXext -lGL"
+
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+=	-O3 -ffast-math
+.endif
+
+pre-everything::
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "You can enable additional compilation optimizations"
+	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's,-(march=pentium|O3|ffast-math),,g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e 's|-I\.[[:space:]]+-I\$$\(srcdir\)[[:space:]]+||' \
 		${WRKSRC}/gui/Makefile.in
+# disable data file installation since distfile does not do
+# The Right Thing(TM)
+	@${REINPLACE_CMD} -E -e \
+		's|^(install-data-am:).*$$|\1|' \
+		${WRKSRC}/Makefile.in
+
+post-configure:
+	@${REINPLACE_CMD} -E -e \
+		's|^(pkgdatadir).*$$|\1=${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}|' \
+		${WRKSRC}/doc/Makefile
 
 .include <bsd.port.mk>
diff --git a/graphics/quat-gui/distinfo b/graphics/quat-gui/distinfo
index c8955d1f2427..b2afd2822e2b 100644
--- a/graphics/quat-gui/distinfo
+++ b/graphics/quat-gui/distinfo
@@ -1 +1 @@
-MD5 (quat-1.11.tar.gz) = ca8af28299924d32166278aa2ef30333
+MD5 (quat-1.20.tar.gz) = bd8326147fcd0e674a0f8d56a64fa787
diff --git a/graphics/quat-gui/pkg-plist b/graphics/quat-gui/pkg-plist
index 108dc93e754d..b14216ad9253 100644
--- a/graphics/quat-gui/pkg-plist
+++ b/graphics/quat-gui/pkg-plist
@@ -1,2 +1,27 @@
 bin/quat
-lib/libquat.a
+%%PORTDOCS%%share/quat-gui/Dendr_st.jpg
+%%PORTDOCS%%share/quat-gui/ce.png
+%%PORTDOCS%%share/quat-gui/chart_de.png
+%%PORTDOCS%%share/quat-gui/chart_us.png
+%%PORTDOCS%%share/quat-gui/ex_1.jpg
+%%PORTDOCS%%share/quat-gui/ex_2.jpg
+%%PORTDOCS%%share/quat-gui/ex_3.jpg
+%%PORTDOCS%%share/quat-gui/gpl.html
+%%PORTDOCS%%share/quat-gui/ie.png
+%%PORTDOCS%%share/quat-gui/oe.png
+%%PORTDOCS%%share/quat-gui/ote.png
+%%PORTDOCS%%share/quat-gui/quat-de-1.html
+%%PORTDOCS%%share/quat-gui/quat-de-2.html
+%%PORTDOCS%%share/quat-gui/quat-de-3.html
+%%PORTDOCS%%share/quat-gui/quat-de-4.html
+%%PORTDOCS%%share/quat-gui/quat-de-5.html
+%%PORTDOCS%%share/quat-gui/quat-de.html
+%%PORTDOCS%%share/quat-gui/quat-us-1.html
+%%PORTDOCS%%share/quat-gui/quat-us-2.html
+%%PORTDOCS%%share/quat-gui/quat-us-3.html
+%%PORTDOCS%%share/quat-gui/quat-us-4.html
+%%PORTDOCS%%share/quat-gui/quat-us-5.html
+%%PORTDOCS%%share/quat-gui/quat-us.html
+%%PORTDOCS%%share/quat-gui/quat.png
+%%PORTDOCS%%share/quat-gui/ve.png
+%%PORTDOCS%%@dirrm share/quat-gui
diff --git a/graphics/quat/Makefile b/graphics/quat/Makefile
index fb03e7380657..60aed9ea8097 100644
--- a/graphics/quat/Makefile
+++ b/graphics/quat/Makefile
@@ -6,20 +6,41 @@
 #
 
 PORTNAME=	quat
-PORTVERSION=	1.11
+PORTVERSION=	1.20
 CATEGORIES=	graphics
 MASTER_SITES=   http://www.physcip.uni-stuttgart.de/phy11733/download/
 
 MAINTAINER=	dyeske@yahoo.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gui
+CONFIGURE_ARGS=	--disable-gui \
+		--datadir=${PREFIX}/share/doc
 USE_REINPLACE=	yes
 
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+=	-O3 -ffast-math
+.endif
+
+pre-everything::
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "You can enable additional compilation optimizations"
+	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -E -e 's,-(march=pentium|O3|ffast-math),,g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e 's|-I\.[[:space:]]+-I\$$\(srcdir\)[[:space:]]+||' \
 		${WRKSRC}/kernel/Makefile.in
+# disable data file installation since distfile does not do
+# The Right Thing(TM)
+	@${REINPLACE_CMD} -E -e \
+		's|^(install-data-am:).*$$|\1|' \
+		${WRKSRC}/Makefile.in
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -E -e \
+		's|^(SUBDIRS.*)doc|\1|' \
+		${WRKSRC}/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/quat/distinfo b/graphics/quat/distinfo
index c8955d1f2427..b2afd2822e2b 100644
--- a/graphics/quat/distinfo
+++ b/graphics/quat/distinfo
@@ -1 +1 @@
-MD5 (quat-1.11.tar.gz) = ca8af28299924d32166278aa2ef30333
+MD5 (quat-1.20.tar.gz) = bd8326147fcd0e674a0f8d56a64fa787
diff --git a/graphics/quat/pkg-plist b/graphics/quat/pkg-plist
index c684881c5c7d..49b1a74d4ce5 100644
--- a/graphics/quat/pkg-plist
+++ b/graphics/quat/pkg-plist
@@ -1 +1,27 @@
-bin/quat
+bin/quat-txt
+%%PORTDOCS%%share/doc/quat/Dendr_st.jpg
+%%PORTDOCS%%share/doc/quat/ce.png
+%%PORTDOCS%%share/doc/quat/chart_de.png
+%%PORTDOCS%%share/doc/quat/chart_us.png
+%%PORTDOCS%%share/doc/quat/ex_1.jpg
+%%PORTDOCS%%share/doc/quat/ex_2.jpg
+%%PORTDOCS%%share/doc/quat/ex_3.jpg
+%%PORTDOCS%%share/doc/quat/gpl.html
+%%PORTDOCS%%share/doc/quat/ie.png
+%%PORTDOCS%%share/doc/quat/oe.png
+%%PORTDOCS%%share/doc/quat/ote.png
+%%PORTDOCS%%share/doc/quat/quat-de-1.html
+%%PORTDOCS%%share/doc/quat/quat-de-2.html
+%%PORTDOCS%%share/doc/quat/quat-de-3.html
+%%PORTDOCS%%share/doc/quat/quat-de-4.html
+%%PORTDOCS%%share/doc/quat/quat-de-5.html
+%%PORTDOCS%%share/doc/quat/quat-de.html
+%%PORTDOCS%%share/doc/quat/quat-us-1.html
+%%PORTDOCS%%share/doc/quat/quat-us-2.html
+%%PORTDOCS%%share/doc/quat/quat-us-3.html
+%%PORTDOCS%%share/doc/quat/quat-us-4.html
+%%PORTDOCS%%share/doc/quat/quat-us-5.html
+%%PORTDOCS%%share/doc/quat/quat-us.html
+%%PORTDOCS%%share/doc/quat/quat.png
+%%PORTDOCS%%share/doc/quat/ve.png
+%%PORTDOCS%%@dirrm share/doc/quat