Update to 0.4.1

* Use qt4 instead of qt3.

Changelog:

05/16/2008      - Use streaming XML instead of DOM
05/04/2008      - Print preview, print improvements
10/05/2007      - Import bug fixes

Version 0.4.0
-------------

09/22/2007      - Added ingredient types
08/05/2007      - BeerXML import
07/25/2007      - I18N improvements
07/20/2007      - Printing improvements
05/30/2007      - Qt 4.3.0, various improvements
07/05/2006	- Calculation corrections
03/12/2006	- Ported to Qt 4
12/03/2005	- Fix column sorting (Lee Henderson)

4 files changed, 33 insertions, 67 deletions

diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 013540dfd07..39636f9f6d1 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:49 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/11 16:28:54 ryoon Exp $
 
-DISTNAME=	qbrew-0.3.5
-PKGREVISION=	13
+DISTNAME=	qbrew-0.4.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.usermode.org/code/
 
@@ -11,14 +10,17 @@ COMMENT=	Homebrewer's recipe calculator
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+CONFIGURE_ARGS+=	--prefix=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+=	--qtdir=${QTDIR}
+
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/qbrew/PLIST b/misc/qbrew/PLIST
index fc180601f9c..d4cba2016eb 100644
--- a/misc/qbrew/PLIST
+++ b/misc/qbrew/PLIST
@@ -1,35 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/11 16:28:54 ryoon Exp $
 bin/qbrew
-share/doc/qbrew/en/primer-design.html
-share/doc/qbrew/en/primer-equipment.html
-share/doc/qbrew/en/primer-firstbrew.html
-share/doc/qbrew/en/primer-glossary.html
-share/doc/qbrew/en/primer-mashing.html
-share/doc/qbrew/en/primer-recipes.html
-share/doc/qbrew/en/primer.html
-share/doc/qbrew/en/qbrew-changes.html
-share/doc/qbrew/en/qbrew-commandline.html
-share/doc/qbrew/en/qbrew-configuration.html
-share/doc/qbrew/en/qbrew-copyright.html
-share/doc/qbrew/en/qbrew-credits.html
-share/doc/qbrew/en/qbrew-faq.html
-share/doc/qbrew/en/qbrew-handbook.html
-share/doc/qbrew/en/qbrew-hop.html
-share/doc/qbrew/en/qbrew-install.html
-share/doc/qbrew/en/qbrew-intro.html
-share/doc/qbrew/en/qbrew-misc.html
-share/doc/qbrew/en/qbrew-notes.html
-share/doc/qbrew/en/qbrew-reference.html
-share/doc/qbrew/en/qbrew-using.html
-share/doc/qbrew/en/qbrew.docbook
-share/doc/qbrew/en/qbrew.xsl
-share/doc/qbrew/en/sqa.html
-share/qbrew/ChangeLog
-share/qbrew/LICENSE
-share/qbrew/README
-share/qbrew/paleale.qbrew
-share/qbrew/qbrew.png
-share/qbrew/qbrew.svg
+share/doc/qbrew/LICENSE
+share/doc/qbrew/README
+share/doc/qbrew/handbook-configuration.html
+share/doc/qbrew/handbook-copyright.html
+share/doc/qbrew/handbook-credits.html
+share/doc/qbrew/handbook-faq.html
+share/doc/qbrew/handbook-hop.html
+share/doc/qbrew/handbook-index.html
+share/doc/qbrew/handbook-intro.html
+share/doc/qbrew/handbook-misc.html
+share/doc/qbrew/handbook-notes.html
+share/doc/qbrew/handbook-reference.html
+share/doc/qbrew/handbook-using.html
+share/doc/qbrew/primer-design.html
+share/doc/qbrew/primer-equipment.html
+share/doc/qbrew/primer-firstbrew.html
+share/doc/qbrew/primer-glossary.html
+share/doc/qbrew/primer-mashing.html
+share/doc/qbrew/primer-recipes.html
+share/doc/qbrew/primer.html
 share/qbrew/qbrewdata
 share/qbrew/splash.png
-share/qbrew/stout.qbrew
diff --git a/misc/qbrew/distinfo b/misc/qbrew/distinfo
index 243e02f8d66..7a8678fcab0 100644
--- a/misc/qbrew/distinfo
+++ b/misc/qbrew/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/12/01 14:09:53 rillig Exp $
+$NetBSD: distinfo,v 1.5 2013/06/11 16:28:54 ryoon Exp $
 
-SHA1 (qbrew-0.3.5.tar.gz) = ec67830af5adb413a60c79c59c350467abb6ba7c
-RMD160 (qbrew-0.3.5.tar.gz) = 3134f2763164ba6e9b1200e61f8fe8d1ca916fd4
-Size (qbrew-0.3.5.tar.gz) = 458523 bytes
-SHA1 (patch-aa) = e231af46234b81178e7acea69133f78d08128e42
+SHA1 (qbrew-0.4.1.tar.gz) = 44c82fee8ec93f8c274c87b1b673cd0c44503dea
+RMD160 (qbrew-0.4.1.tar.gz) = 47a87ae2600e16290526d0eaddf401e8edade285
+Size (qbrew-0.4.1.tar.gz) = 291237 bytes
diff --git a/misc/qbrew/patches/patch-aa b/misc/qbrew/patches/patch-aa
deleted file mode 100644
index f03f6e37a01..00000000000
--- a/misc/qbrew/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/12/01 14:09:53 rillig Exp $
-
---- qbrew/calc.h.orig	2005-05-31 03:08:34.000000000 +0000
-+++ qbrew/calc.h	2007-12-01 13:57:28.000000000 +0000
-@@ -175,15 +175,15 @@ class Calc {
-     static int SRM(Recipe *r);
- 
-     // convert Specific Gravity to Plato
--    static double Calc::SgToP(double sg);
-+    static double SgToP(double sg);
-     // convert grain extract to yield
--    static double Calc::extractToYield(double extract);
--    static double Calc::yieldToExtract(double yield);
-+    static double extractToYield(double extract);
-+    static double yieldToExtract(double yield);
- 
-     // add an entry to the utilization table
-     static void addUEntry(const UEntry &u);
-     // get the table of utilizations
--    static const QValueList<UEntry> &Calc::getUEntryList();
-+    static const QValueList<UEntry> &getUEntryList();
- 
-  private:
-     static double calcOG(Recipe *r);