- Change options of build in file Makefile.

- BUMP PORTREVISION

Submitted by:	Joseph S. Atkinson <jsa@freebsd.org> via email

3 files changed, 30 insertions, 35 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index f3cf326d61d4..df170906370b 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	bluefish
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	www editors
 MASTER_SITES=	SF
 
@@ -21,13 +22,6 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_WEBLINT)
-RUN_DEPENDS+=	weblint:${PORTSDIR}/www/weblint
-.endif
-.if defined(WITH_TIDY)
-RUN_DEPENDS+=	tidy:${PORTSDIR}/www/tidy
-.endif
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
@@ -41,31 +35,12 @@ CONFIGURE_ARGS=	--with-freedesktop_org-menu=${PREFIX}/share/applications \
 		--without-gnome2_4-appreg \
 		--with-icon-path=${PREFIX}/share/pixmaps
 
-# Turns debugging output on
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--with-debugging-output
-.endif
-
-.if defined(WITHOUT_SPLASH)
-CONFIGURE_ARGS+=	--disable-splash-screen
-.endif
-
 MAN1=		bluefish.1
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Bluefish  has the following tunable option(s):"
-	@${ECHO_MSG} "  WITH_DEBUG		for debug support"
-	@${ECHO_MSG} "  WITHOUT_WEBLINT	disable the weblint syntax and style checker"
-	@${ECHO_MSG} "  WITH_TIDY		for the tidy html cleanup program"
-	@${ECHO_MSG} "  WITHOUT_SPLASH	disable the splash screen"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "For Highlighting to work, please enable UTF-8 support in devel/pcre."
-	@${ECHO_MSG} "This will reduce the number of warning in the console when running bluefish."
-	@${ECHO_MSG} ""
-
-pre-install:
-	@${MKDIR} ${PREFIX}/share/mime
+OPTIONS=	DEBUG "Enable debugging output" Off \
+		SPLASH "Show splash screen at startup" On \
+		TIDY "Include Tidy HTML cleanup program" Off \
+		WEBLINT "Include Weblint syntax and style checker" On
 
 .include <bsd.port.pre.mk>
 
@@ -73,6 +48,11 @@ pre-install:
 USE_GNOME+=	libgnomeui
 .endif
 
+# Turns debugging output on
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--with-debugging-output
+.endif
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
@@ -81,10 +61,25 @@ USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .endif
 
+.if defined(WITHOUT_SPLASH)
+CONFIGURE_ARGS+=	--disable-splash-screen
+.endif
+
+.if defined(WITH_TIDY)
+RUN_DEPENDS+=	tidy:${PORTSDIR}/www/tidy
+.endif
+.if !defined(WITHOUT_WEBLINT)
+RUN_DEPENDS+=	weblint:${PORTSDIR}/www/weblint
+.endif
+
+pre-install:
+	@${MKDIR} ${PREFIX}/share/mime
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/bflang
 	${INSTALL_DATA} ${WRKSRC}/data/bflang/sample.bflang2 ${DOCSDIR}/bflang
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/www/bluefish/files/patch-data_bflang-Makefile.in b/www/bluefish/files/patch-data_bflang-Makefile.in
index f6480afe9364..6a4cf403b43d 100644
--- a/www/bluefish/files/patch-data_bflang-Makefile.in
+++ b/www/bluefish/files/patch-data_bflang-Makefile.in
@@ -1,6 +1,6 @@
---- data/bflang/Makefile.in.orig	2010-09-16 09:20:07.000000000 -0300
-+++ data/bflang/Makefile.in	2011-02-08 11:13:16.000000000 -0200
-@@ -374,26 +374,7 @@
+--- ./data/bflang/Makefile.in.orig	2010-09-16 08:20:07.000000000 -0400
++++ ./data/bflang/Makefile.in	2011-01-31 14:05:03.000000000 -0500
+@@ -374,26 +374,6 @@
  	test -n "$$files" || exit 0; \
  	echo " ( cd '$(DESTDIR)$(bflangrngdir)' && rm -f" $$files ")"; \
  	cd "$(DESTDIR)$(bflangrngdir)" && rm -f $$files
@@ -16,7 +16,7 @@
 -	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bflangsampledir)'"; \
 -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bflangsampledir)" || exit $$?; \
 -	done
- 
+-
 -uninstall-bflangsampleDATA:
 -	@$(NORMAL_UNINSTALL)
 -	@list='$(bflangsample_DATA)'; test -n "$(bflangsampledir)" || list=; \
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 1ef16b551099..256e312bafc3 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -295,12 +295,12 @@ share/xml/bluefish/catalog.xml
 %%DATADIR%%/bflib/bflib_xhtml.xml.gz
 %%DATADIR%%/bluefish_splash.png
 %%DATADIR%%/encodings
+%%DATADIR%%/snippets
 %%DATADIR%%/templates/C_header
 %%DATADIR%%/templates/C_header_GPL
 %%DATADIR%%/templates/HTML_5
 %%DATADIR%%/templates/PHP
 %%DATADIR%%/templates/XHTML_1.0
-%%DATADIR%%/snippets
 %%PORTDOCS%%%%DOCSDIR%%/bflang/sample.bflang2
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/bflang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%