[Midnightbsd-cvs] mports [17640] trunk/editors/gedit: update depends

Sun Sep 28 18:48:28 EDT 2014

Revision: 17640
          http://svnweb.midnightbsd.org/mports/?rev=17640
Author:   laffer1
Date:     2014-09-28 18:48:26 -0400 (Sun, 28 Sep 2014)
Log Message:
-----------
update depends

Modified Paths:
--------------
    trunk/editors/gedit/Makefile
    trunk/editors/gedit/pkg-plist

Modified: trunk/editors/gedit/Makefile
===================================================================

--- trunk/editors/gedit/Makefile	2014-09-28 22:46:02 UTC (rev 17639)
+++ trunk/editors/gedit/Makefile	2014-09-28 22:48:26 UTC (rev 17640)
@@ -1,70 +1,48 @@
-# New ports collection makefile for:	gedit2
-# Date created:				14 May 2002
-# Whom:					Joe Marcus Clarke <marcus at FreeBSD.org>
-#
 # $MidnightBSD$
 # $FreeBSD: ports/editors/gedit/Makefile,v 1.66 2007/12/12 04:36:21 marcus Exp $
-#   $MCom: ports-stable/editors/gedit/Makefile,v 1.9 2007/12/02 02:00:32 marcus Exp $
-#
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A small but powerful text editor for GNOME 2 Desktop Environment
+COMMENT=	Small but powerful text editor for GNOME 2 Desktop Environment
+
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
-USE_XORG=	sm
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		desktop-file-utils gettext gmake libtool:keepla  pathfix \
+		pkgconfig tar:bzip2
+USE_XORG=	ice sm
 INSTALLS_OMF=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
-		desktopfileutils gnomedocutils ltasneededhack
+USE_GNOME=	gnomeprefix intlhack gconf2 gtksourceview2 gnomedocutils
+GNU_CONFIGURE=	yes
 GNOME_DESKTOP_VERSION=2
-WANT_GNOME=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION="2.20"
 
-MAN1=		gedit.1
 GCONF_SCHEMAS=	gedit.schemas gedit-file-browser.schemas
 
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
+OPTIONS_DEFINE=	PYTHON
+OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
+PYTHON_CONFIGURE_ENABLE=python
+PYTHON_USE=		GNOME=pygtksourceview
 
-.if ${HAVE_GNOME:Mpygtksourceview}!=""
-USE_PYTHON=	yes
-EXTENSIONS+=	python
-USE_GNOME+=	pygtksourceview
-CONFIGURE_ARGS+=--enable-python
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
+post-patch:
+	@${REINPLACE_CMD} '/^libgedit_la_LIBADD =/s/=/= -lgmodule-2.0/' \
+		${WRKSRC}/gedit/Makefile.in
+	@${REINPLACE_CMD} '/EGG_SMCLIENT_LIBS =/s/$$/ -lICE/' \
+		${WRKSRC}/gedit/smclient/Makefile.in
 
-#pre-build:
-#	${MKDIR} ${WRKSRC}/bindings/python/.deps
-#.for ff in gedit_la-gedit.Plo gedit_la-geditcommands.Plo gedit_la-geditutils.Plo
-#	${TOUCH} ${WRKSRC}/bindings/python/.deps/${ff}
-#.endfor
-
-post-install:
-	@-update-desktop-database
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/editors/gedit/pkg-plist
===================================================================
--- trunk/editors/gedit/pkg-plist	2014-09-28 22:46:02 UTC (rev 17639)
+++ trunk/editors/gedit/pkg-plist	2014-09-28 22:48:26 UTC (rev 17640)
@@ -23,10 +23,8 @@
 include/gedit-%%VERSION%%/gedit/gedit-utils.h
 include/gedit-%%VERSION%%/gedit/gedit-view.h
 include/gedit-%%VERSION%%/gedit/gedit-window.h
-lib/gedit-2/plugin-loaders/libcloader.a
 lib/gedit-2/plugin-loaders/libcloader.la
 lib/gedit-2/plugin-loaders/libcloader.so
-%%PYTHON%%lib/gedit-2/plugin-loaders/libpythonloader.a
 %%PYTHON%%lib/gedit-2/plugin-loaders/libpythonloader.la
 %%PYTHON%%lib/gedit-2/plugin-loaders/libpythonloader.so
 lib/gedit-2/plugins/changecase.gedit-plugin
@@ -57,28 +55,20 @@
 %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyc
 %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyo
 lib/gedit-2/plugins/filebrowser.gedit-plugin
-lib/gedit-2/plugins/libchangecase.a
 lib/gedit-2/plugins/libchangecase.la
 lib/gedit-2/plugins/libchangecase.so
-lib/gedit-2/plugins/libdocinfo.a
 lib/gedit-2/plugins/libdocinfo.la
 lib/gedit-2/plugins/libdocinfo.so
-lib/gedit-2/plugins/libfilebrowser.a
 lib/gedit-2/plugins/libfilebrowser.la
 lib/gedit-2/plugins/libfilebrowser.so
-lib/gedit-2/plugins/libmodelines.a
 lib/gedit-2/plugins/libmodelines.la
 lib/gedit-2/plugins/libmodelines.so
-lib/gedit-2/plugins/libsort.a
 lib/gedit-2/plugins/libsort.la
 lib/gedit-2/plugins/libsort.so
-lib/gedit-2/plugins/libspell.a
 lib/gedit-2/plugins/libspell.la
 lib/gedit-2/plugins/libspell.so
-lib/gedit-2/plugins/libtaglist.a
 lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtaglist.so
-lib/gedit-2/plugins/libtime.a
 lib/gedit-2/plugins/libtime.la
 lib/gedit-2/plugins/libtime.so
 lib/gedit-2/plugins/modelines.gedit-plugin
@@ -154,6 +144,7 @@
 lib/gedit-2/plugins/time.gedit-plugin
 libdata/pkgconfig/gedit-%%VERSION%%.pc
 libexec/gedit-2/gedit-bugreport.sh
+man/man1/gedit.1.gz
 share/applications/gedit.desktop
 %%DOCSDIR%%/GeditMessage.html
 %%DOCSDIR%%/GeditMessageBus.html
@@ -624,7 +615,6 @@
 @dirrm share/gedit-2/icons
 @dirrm share/gedit-2
 @dirrm %%DOCSDIR%%
- at dirrmtry share/applications
 @dirrmtry libexec/gedit-2
 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
 %%PYTHON%%@dirrm lib/gedit-2/plugins/quickopen

