svn commit: r340405 - in head/devel: . gitg gitg0

Dmitry Marakasov amdmi3 at FreeBSD.org
Mon Jan 20 15:19:22 UTC 2014 

Author: amdmi3
Date: Mon Jan 20 15:19:20 2014
New Revision: 340405
URL: http://svnweb.freebsd.org/changeset/ports/340405
QAT: https://qat.redports.org/buildarchive/r340405/

Log:
  - As gitg is becoming more and more bloated with heavy gnome3 depends, resurrect lightweight gtk2 gitg version 0.0.8 as a separate port
  - Add mutual conflicts between gitg and gitg0
  - While here, fix portlint warning in gitg

Added:
  head/devel/gitg0/
     - copied from r327723, head/devel/gitg/
Modified:
  head/devel/Makefile
  head/devel/gitg/Makefile
  head/devel/gitg0/Makefile
  head/devel/gitg0/pkg-plist

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Jan 20 15:12:23 2014	(r340404)
+++ head/devel/Makefile	Mon Jan 20 15:19:20 2014	(r340405)
@@ -554,6 +554,7 @@
     SUBDIR += git-merge-changelog
     SUBDIR += git-review
     SUBDIR += git-subversion
+    SUBDIR += gitg0
     SUBDIR += gitg
     SUBDIR += gitolite
     SUBDIR += gitolite2

Modified: head/devel/gitg/Makefile
==============================================================================
--- head/devel/gitg/Makefile	Mon Jan 20 15:12:23 2014	(r340404)
+++ head/devel/gitg/Makefile	Mon Jan 20 15:19:20 2014	(r340405)
@@ -14,7 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		git>=1.7.0.2:${PORTSDIR}/devel/git
+		git:${PORTSDIR}/devel/git
+
+CONFLICTS=	gitg0-[0-9]*
 
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
@@ -27,7 +29,7 @@ USES=		gettext gmake pkgconfig pathfix
 INSTALLS_ICONS=	yes
 GLIB_SCHEMAS=	org.gnome.gitg.gschema.xml
 
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes

Modified: head/devel/gitg0/Makefile
==============================================================================
--- head/devel/gitg/Makefile	Fri Sep 20 17:04:43 2013	(r327723)
+++ head/devel/gitg0/Makefile	Mon Jan 20 15:19:20 2014	(r340405)
@@ -3,27 +3,35 @@
 
 PORTNAME=	gitg
 PORTVERSION=	0.0.8
-PORTREVISION=	1
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	0
 
 MAINTAINER=	amdmi3 at FreeBSD.org
-COMMENT=	GTK-based git repository viewer
+COMMENT=	GTK-based git repository viewer (gtk2 version)
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git>=1.7.0.2:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+
+CONFLICTS=	gitg-[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gconf2 gtk20 gtksourceview2 gnomehack
-USES=		gettext gmake pkgconfig
+USES=		gmake pkgconfig
 
 INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	gitg.schemas
 
-MAN1=		gitg.1
+PORTSCOUT=	limit:^0\.
+
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=nls
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/devel/gitg0/pkg-plist
==============================================================================
--- head/devel/gitg/pkg-plist	Fri Sep 20 17:04:43 2013	(r327723)
+++ head/devel/gitg0/pkg-plist	Mon Jan 20 15:19:20 2014	(r340405)
@@ -18,6 +18,7 @@ lib/libgitg-1.0.la
 lib/libgitg-1.0.so
 lib/libgitg-1.0.so.0
 libdata/pkgconfig/libgitg-1.0.pc
+man/man1/gitg.1.gz
 share/applications/gitg.desktop
 %%DATADIR%%/icons/gitg.svg
 %%DATADIR%%/icons/gitg128x128.png
@@ -46,22 +47,22 @@ share/icons/hicolor/24x24/apps/gitg.png
 share/icons/hicolor/32x32/apps/gitg.png
 share/icons/hicolor/48x48/apps/gitg.png
 share/icons/hicolor/scalable/apps/gitg.svg
-share/locale/da/LC_MESSAGES/gitg.mo
-share/locale/de/LC_MESSAGES/gitg.mo
-share/locale/en_GB/LC_MESSAGES/gitg.mo
-share/locale/es/LC_MESSAGES/gitg.mo
-share/locale/fr/LC_MESSAGES/gitg.mo
-share/locale/gl/LC_MESSAGES/gitg.mo
-share/locale/it/LC_MESSAGES/gitg.mo
-share/locale/lt/LC_MESSAGES/gitg.mo
-share/locale/nb/LC_MESSAGES/gitg.mo
-share/locale/nl/LC_MESSAGES/gitg.mo
-share/locale/pa/LC_MESSAGES/gitg.mo
-share/locale/pt_BR/LC_MESSAGES/gitg.mo
-share/locale/ro/LC_MESSAGES/gitg.mo
-share/locale/sl/LC_MESSAGES/gitg.mo
-share/locale/sv/LC_MESSAGES/gitg.mo
-share/locale/zh_CN/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gitg.mo
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -81,6 +82,5 @@ share/locale/zh_CN/LC_MESSAGES/gitg.mo
 @dirrm %%DATADIR%%/language-specs
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
- at dirrmtry share/applications
 @dirrm include/libgitg-1.0/libgitg
 @dirrm include/libgitg-1.0

More information about the svn-ports-all mailing list