Support stage

2 files changed, 9 insertions, 36 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 5c8d8eb393c7..87bb740e8dde 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -4,42 +4,33 @@
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A small but powerful text editor for GNOME 2 Desktop Environment
+COMMENT=	Small but powerful text editor for GNOME 2 Desktop Environment
 
 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 pathfix pkgconfig tar:bzip2
 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
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mpygtksourceview}!=""
@@ -53,13 +44,4 @@ CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-#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>
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index d13b938ee27c..8b067a53ce69 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -23,10 +23,8 @@ include/gedit-%%VERSION%%/gedit/gedit-tab.h
 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 @@ lib/gedit-2/plugins/docinfo.gedit-plugin
 %%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/taglist.gedit-plugin
 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