It was decided to stop putting lib/qt*/ prefix to libs in WANTLIB: they do
not intersect neither in Qt3 vs. Qt4, or in Qt4 vs. Qt5 cases. I still try
to make espie@ look at my patches removing those and okay them. :)

--
Vadim Zhukov
16 дек. 2014 г. 1:15 пользователь "Jérémie Courrèges-Anglas" <[email protected]>
написал:

>
> Another gui for git, another update.  This switches qgit to Qt4 and
> a new upstream.  While here install the README which contains useful
> info, and reorder according to Makefile.template.
>
> ok / comments?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/qgit/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile    11 Mar 2013 10:50:27 -0000      1.8
> +++ Makefile    15 Dec 2014 22:05:59 -0000
> @@ -1,26 +1,34 @@
>  # $OpenBSD: Makefile,v 1.8 2013/03/11 10:50:27 espie Exp $
>
>  COMMENT =      qt git repository viewer
> -CATEGORIES =   devel x11
> -HOMEPAGE =     http://digilander.libero.it/mcostalba/
> -
> -DISTNAME =     qgit-1.5.7
> -REVISION =     2
> -EXTRACT_SUFX = .tar.bz2
>
> -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qgit/}
> -MODULES =      x11/qt3
> +# XXX also change MASTER_SITES when updating
> +DISTNAME =     qgit-2.5
>
> -CONFIGURE_STYLE = gnu
> -CONFIGURE_ENV += ${MODQT_CONFIGURE_ENV} LDFLAGS=-L${LOCALBASE}/lib
> -CONFIGURE_ENV += QT_MOC=${MODQT3_MOC} QT_UIC=${MODQT3_UIC}
> -CONFIGURE_ARGS += ${MODQT_CONFIGURE_ARGS}
> +CATEGORIES =   devel x11
>
> -RUN_DEPENDS = devel/git
> +HOMEPAGE =     http://libre.tibirna.org/projects/qgit
>
>  # GPLv2
>  PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += ICE SM X11 Xft c m pthread pthread-stubs stdc++ xcb
> +WANTLIB += ICE lib/qt4/QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
> +WANTLIB += freetype m pthread stdc++
> +
> +MASTER_SITES = http://libre.tibirna.org/attachments/download/9/
> +
> +MODULES =      x11/qt4
> +
> +RUN_DEPENDS =  devel/git
> +
> +WRKSRC =       ${WRKDIR}/redivivus
> +
> +do-configure:
> +       cd ${WRKSRC} && qmake4 .
> +
> +do-install:
> +       ${INSTALL_PROGRAM} ${WRKSRC}/bin/qgit ${PREFIX}/bin/
> +       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qgit/
> +       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qgit/
>
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/qgit/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo    17 Dec 2007 21:36:18 -0000      1.2
> +++ distinfo    14 Dec 2014 01:35:47 -0000
> @@ -1,5 +1,2 @@
> -MD5 (qgit-1.5.7.tar.bz2) = KqUqUeAewM3oUiKB2aziqg==
> -RMD160 (qgit-1.5.7.tar.bz2) = 2cqMC6Cq1PUBpWH38ob1OVXO6qc=
> -SHA1 (qgit-1.5.7.tar.bz2) = SsTqcrk3f4cZxhlaPwdQGtPP6jo=
> -SHA256 (qgit-1.5.7.tar.bz2) = W/wYrenrruIW/Fm4j8cd0S8rlzrtKh7N9UfIuMu5FUI=
> -SIZE (qgit-1.5.7.tar.bz2) = 206601
> +SHA256 (qgit-2.5.tar.gz) = JfHKKGDYQNh7mRnTT8OhsF1BY2ce2H0pw+SooJ4LJJk=
> +SIZE (qgit-2.5.tar.gz) = 250855
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/devel/qgit/pkg/DESCR,v
> retrieving revision 1.2
> diff -u -p -r1.2 DESCR
> --- pkg/DESCR   15 Apr 2010 13:56:35 -0000      1.2
> +++ pkg/DESCR   15 Dec 2014 22:08:09 -0000
> @@ -1,3 +1,2 @@
> -qgit is a graphical front-end to git... its main interest is that you
> -can resize the fonts, instead of squinting at the too small stuff in
> tkgit,
> -which has been designed for PlaySchool computers.
> +qgit is a front-end for git, similar to gitk.  It can be setup to run
> +custom commands.
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/qgit/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST   23 Jul 2007 19:20:31 -0000      1.1.1.1
> +++ pkg/PLIST   14 Dec 2014 01:53:10 -0000
> @@ -1,2 +1,4 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/23 19:20:31 espie Exp $
> -bin/qgit
> +@bin bin/qgit
> +share/doc/qgit/
> +share/doc/qgit/README
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>
>
  • qgit-2.5 Jérémie Courrèges-Anglas
    • Re: qgit-2.5 Vadim Zhukov

Reply via email to