1 files changed, 19 insertions, 19 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 18119ddbbada..b6185afeb3d9 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scite
 PORTVERSION=	1.55
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -23,39 +24,38 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnomehier
 MAKEFILE=	makefile
-USE_REINPLACE=	yes
-PLIST_SUB=	GNOME_COMMENT=${GNOME_COMMENT}
+MAKE_ENV=	CC="${CXX}"
 
-.if defined(WITH_GNOME)
-USE_GNOME=	gtk20 gnomeprefix
-PKGNAMESUFFIX=	-gnome
-GNOME_COMMENT=	''
-.elif defined(WITH_GTK2)
-USE_GNOME=	gtk20
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
 PKGNAMESUFFIX=	-gtk2
 .else
-USE_GNOME=	gtk12
+USE_GNOME+=	gtk12
 MAKE_ARGS=	GTK1=yes
 .endif
-GNOME_COMMENT?=	'@comment '
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "SciTE has the following tunable option(s):"
+	@${ECHO_MSG} "	WITH_GTK2=yes		Turns on GTK-2.x support"
+	@${ECHO_MSG} "	(unavailable if x11-toolkits/scintilla has been"
+	@${ECHO_MSG} "	 built with GTK-1.x support)"
+	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,$$(CC),$$(CXX),g' ${WRKSRC}/makefile
-.if defined(WITH_GNOME)
-	@${TR} -d "\r" < ${WRKSRC}/SciTE.desktop > ${WRKDIR}/SciTE.desktop
-	@${ECHO_CMD} 'Categories=Application;Development;' >> ${WRKDIR}/SciTE.desktop
-.endif
+	@cd ${WRKSRC} && ${MV} SciTE.desktop SciTE.desktop.pre_tr \
+		&& ${TR} -d "\r" < SciTE.desktop.pre_tr > SciTE.desktop
+	@${ECHO_CMD} 'Categories=Application;Development;' >> ${WRKSRC}/SciTE.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/gnome/pixmaps
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
-.if defined(WITH_GNOME)
-	${INSTALL_DATA} ${WRKDIR}/SciTE.desktop ${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/gnome/pixmaps
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}