Date: Sat, 29 Sep 2007 00:29:48 GMT From: David Johnson <david@usermode.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/116723: [maintainer update] misc/qbrew update Message-ID: <200709290029.l8T0TmaZ070957@www.freebsd.org> Resent-Message-ID: <200709290030.l8T0U2HV038546@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116723 >Category: ports >Synopsis: [maintainer update] misc/qbrew update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 29 00:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: David Johnson >Release: 6.2-STABLE >Organization: >Environment: FreeBSD scatha.usermode.org 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Aug 18 12:24:23 PDT 2007 david@scatha.usermode.org:/usr/obj/usr/src/sys/SCATHA i386 >Description: Maintainer update of misc/qbrew port. From version 0.3.5 to 0.4.0. Port now uses qt4. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN qbrew.org/Makefile qbrew/Makefile --- qbrew.org/Makefile 2007-09-27 20:37:00.000000000 -0700 +++ qbrew/Makefile 2007-09-27 22:37:07.000000000 -0700 @@ -6,33 +6,28 @@ # PORTNAME= qbrew -PORTVERSION= 0.3.5 -PORTREVISION= 1 +PORTVERSION= 0.4.0 CATEGORIES= misc MASTER_SITES= http://www.usermode.org/code/ MAINTAINER= david@usermode.org COMMENT= A homebrewer's recipe calculator -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_QT_VER= 3 +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc uic rcc xml gui PORTDOCS= * -QT_NONSTANDARD= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ - --with-qt-dir=${X11BASE} -CONFIGURE_ENV= MOC=${X11BASE}/bin/moc \ - UIC=${X11BASE}/bin/uic +HAS_CONFIGURE= yes + +CONFIGURE_ENV+= HAVEDEFS="HAVE_ROUND" \ + BINDIR="${PREFIX}/bin" \ + DATADIR="${DATADIR}" \ + DOCDIR="${DOCSDIR}" .include <bsd.port.pre.mk> -post-patch: -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -E 's,^(SUBDIRS = .*) docs,\1,' \ - ${WRKSRC}/Makefile.in -.endif +do-configure: + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${QMAKE} -unix CONFIG+="configure" qbrew.pro post-install: ${STRIP_CMD} ${PREFIX}/bin/qbrew diff -ruN qbrew.org/distinfo qbrew/distinfo --- qbrew.org/distinfo 2007-09-27 20:37:00.000000000 -0700 +++ qbrew/distinfo 2007-09-27 22:37:28.000000000 -0700 @@ -1,3 +1,3 @@ -MD5 (qbrew-0.3.5.tar.gz) = 677d48a34954deedf3c812e77e6462bb -SHA256 (qbrew-0.3.5.tar.gz) = 92f9c2cfbeac7f4a158a5cc17bf88ce372ed5bf2219091bf15bf7f0f70023fdb -SIZE (qbrew-0.3.5.tar.gz) = 458523 +MD5 (qbrew-0.4.0.tar.gz) = 79c60eff3424558f077dd6f807558d6b +SHA256 (qbrew-0.4.0.tar.gz) = 7b8427f5309dafbbb8b6542642bb31efd8af114fd94c1e8708e0eb1cfda46779 +SIZE (qbrew-0.4.0.tar.gz) = 283844 diff -ruN qbrew.org/files/patch-qbrew-calc.h qbrew/files/patch-qbrew-calc.h --- qbrew.org/files/patch-qbrew-calc.h 2007-09-27 20:37:00.000000000 -0700 +++ qbrew/files/patch-qbrew-calc.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,22 +0,0 @@ ---- qbrew/calc.h.orig Sat Dec 16 14:34:28 2006 -+++ qbrew/calc.h Sat Dec 16 14:34:52 2006 -@@ -175,15 +175,15 @@ - 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); diff -ruN qbrew.org/pkg-plist qbrew/pkg-plist --- qbrew.org/pkg-plist 2007-09-27 20:37:00.000000000 -0700 +++ qbrew/pkg-plist 2007-09-27 21:08:34.000000000 -0700 @@ -1,11 +1,4 @@ bin/qbrew -%%DATADIR%%/ChangeLog -%%DATADIR%%/LICENSE -%%DATADIR%%/README -%%DATADIR%%/paleale.qbrew -%%DATADIR%%/qbrew.png -%%DATADIR%%/qbrew.svg %%DATADIR%%/qbrewdata %%DATADIR%%/splash.png -%%DATADIR%%/stout.qbrew @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709290029.l8T0TmaZ070957>