ports/158170: [UPDATE] x11/Terminal to 0.4.8
Olivier Duchateau
duchateau.olivier at gmail.com
Wed Jun 22 17:00:29 UTC 2011
>Number: 158170
>Category: ports
>Synopsis: [UPDATE] x11/Terminal to 0.4.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 22 17:00:22 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.2-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Announce: http://foo-projects.org/pipermail/xfce/2011-June/028861.html
Rename extra patch and clean patch file.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/x11/Terminal/Makefile Terminal/Makefile
--- /usr/ports/x11/Terminal/Makefile 2011-06-07 08:14:29.000000000 +0200
+++ Terminal/Makefile 2011-06-22 18:38:57.000000000 +0200
@@ -6,8 +6,7 @@
#
PORTNAME= Terminal
-PORTVERSION= 0.4.7
-PORTREVISION= 1
+PORTVERSION= 0.4.8
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME:L}/${PORTVERSION:R}
@@ -27,6 +26,7 @@
USE_XORG= x11
CONFIGURE_ARGS= --without-gnome-default-appsdir
+CONFIGURE_ENV+= ac_cv_prog_AWK="${AWK}"
OPTIONS= DBUS "Enable D-BUS support" on \
NLS "Enable Native Language Support" on
@@ -37,7 +37,7 @@
.include <bsd.port.pre.mk>
.if defined(NOPORTDOCS)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-doc-Makefile.in
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-doc_Makefile.in
.endif
.if !defined(WITHOUT_DBUS)
diff -urN /usr/ports/x11/Terminal/distinfo Terminal/distinfo
--- /usr/ports/x11/Terminal/distinfo 2011-04-14 14:00:56.000000000 +0200
+++ Terminal/distinfo 2011-06-22 18:38:57.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (xfce4/Terminal-0.4.7.tar.bz2) = 12ab46043ebf2de07e5a1c6826c6b0a677eb3ba58cc1c883a1a906b83ac6fd01
-SIZE (xfce4/Terminal-0.4.7.tar.bz2) = 1582320
+SHA256 (xfce4/Terminal-0.4.8.tar.bz2) = fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d
+SIZE (xfce4/Terminal-0.4.8.tar.bz2) = 1585791
diff -urN /usr/ports/x11/Terminal/files/extra-patch-doc-Makefile.in Terminal/files/extra-patch-doc-Makefile.in
--- /usr/ports/x11/Terminal/files/extra-patch-doc-Makefile.in 2011-04-25 14:16:32.000000000 +0200
+++ Terminal/files/extra-patch-doc-Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,183 +0,0 @@
---- doc/Makefile.in.orig 2011-03-07 13:18:35.000000000 +0100
-+++ doc/Makefile.in 2011-03-07 13:28:48.000000000 +0100
-@@ -53,9 +53,9 @@
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-- html-recursive info-recursive install-data-recursive \
-+ info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
-- install-html-recursive install-info-recursive \
-+ install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-@@ -293,7 +293,6 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = \
-- images \
- po
-
- HTML_STYLESHEET = $(PACKAGE)-html.xsl
-@@ -361,18 +360,6 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-cssDATA: $(css_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
-- @list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
-- for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- echo "$$d$$p"; \
-- done | $(am__base_list) | \
-- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \
-- done
-
- uninstall-cssDATA:
- @$(NORMAL_UNINSTALL)
-@@ -583,9 +570,6 @@
- all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- for dir in "$(DESTDIR)$(cssdir)"; do \
-- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-- done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -624,15 +608,11 @@
-
- dvi-am:
-
--html: html-recursive
--
--html-am:
--
- info: info-recursive
-
- info-am:
-
--install-data-am: install-cssDATA install-data-local
-+install-data-am: install-data-local
-
- install-dvi: install-dvi-recursive
-
-@@ -640,10 +620,6 @@
-
- install-exec-am:
-
--install-html: install-html-recursive
--
--install-html-am:
--
- install-info: install-info-recursive
-
- install-info-am:
-@@ -685,10 +661,10 @@
- all all-am check check-am clean clean-generic clean-libtool \
- clean-local ctags ctags-recursive dist-hook distclean \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
-- dvi-am html html-am info info-am install install-am \
-- install-cssDATA install-data install-data-am \
-+ dvi-am info info-am install install-am \
-+ install-data install-data-am \
- install-data-local install-dvi install-dvi-am install-exec \
-- install-exec-am install-html install-html-am install-info \
-+ install-exec-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
-@@ -700,19 +676,6 @@
- # install the html files to the destdir
- install-data-local:
- for lang in $(ALL_LINGUAS); do \
-- if test -d $(srcdir)/html/$$lang; then \
-- dest=$(DESTDIR)$(docdir)/$$lang; \
-- $(mkinstalldirs) $$dest; \
-- installfiles=`echo $(srcdir)/html/$$lang/*`; \
-- for file in $$installfiles; do \
-- echo "--- Installing "$$file; \
-- $(INSTALL_DATA) $$file $$dest/; \
-- done; \
-- if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
-- echo "--- Creating symlink to C images for $$lang"; \
-- ln -sf $(docdir)/C/images $$dest/images; \
-- fi \
-- fi; \
- file=$(srcdir)/man/$$lang/$(PACKAGE_NAME).1; \
- if test -f $$file ; then \
- if test x"$$lang" = x"C"; then \
-@@ -730,13 +693,6 @@
- uninstall-local:
- for lang in $(ALL_LINGUAS); do \
- dest=$(DESTDIR)$(docdir)/$$lang; \
-- if test -d $$dest; then \
-- if test -L $$dest/images; then \
-- rm -rf $$dest; \
-- else \
-- rm -f $$dest/*.html; \
-- fi \
-- fi; \
- if test x"$$lang" = x"C"; then \
- dest=$(DESTDIR)$(mandir)/man1/$(PACKAGE).1; \
- else \
-@@ -750,7 +706,7 @@
-
- # remove generate html from the srcdir
- clean-local:
-- rm -rf $(srcdir)/html $(srcdir)/man
-+ rm -rf $(srcdir)/man
-
- # regenerate po(t) files
- @GENERATE_DOCUMENTATION_TRUE at update-po:
-@@ -762,9 +718,9 @@
- @GENERATE_DOCUMENTATION_TRUE@ done
-
- # build the translated help files
-- at GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(HTML_STYLESHEET) $(srcdir)/$(MAN_STYLESHEET)
-+ at GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(MAN_STYLESHEET)
- @GENERATE_DOCUMENTATION_TRUE@ @chmod -R u+w $(srcdir); \
-- at GENERATE_DOCUMENTATION_TRUE@ rm -rf $(srcdir)/html $(srcdir)/man; \
-+ at GENERATE_DOCUMENTATION_TRUE@ rm -rf $(srcdir)/man; \
- @GENERATE_DOCUMENTATION_TRUE@ echo; \
- @GENERATE_DOCUMENTATION_TRUE@ echo "*** Generating full XML file ***"; \
- @GENERATE_DOCUMENTATION_TRUE@ echo "Creating Terminal-options.xml"; \
-@@ -790,11 +746,9 @@
- @GENERATE_DOCUMENTATION_TRUE@ -i xgen-doc xgen-man; \
- @GENERATE_DOCUMENTATION_TRUE@ echo "Validating DocBook XML files"; \
- @GENERATE_DOCUMENTATION_TRUE@ $(XMLLINT) --noout --valid xgen-doc xgen-man || exit 1; \
-- at GENERATE_DOCUMENTATION_TRUE@ echo "Creating the HTML pages"; \
-- at GENERATE_DOCUMENTATION_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/html/$$lang/ $(srcdir)/$(HTML_STYLESHEET) xgen-doc; \
- @GENERATE_DOCUMENTATION_TRUE@ echo "Creating the MAN page"; \
- @GENERATE_DOCUMENTATION_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/man/$$lang/$(PACKAGE_NAME).1 $(srcdir)/$(MAN_STYLESHEET) xgen-man; \
-- at GENERATE_DOCUMENTATION_TRUE@ chmod -R u+w $(srcdir)/html/$$lang $(srcdir)/man/$$lang; \
-+ at GENERATE_DOCUMENTATION_TRUE@ chmod -R u+w $(srcdir)/man/$$lang; \
- @GENERATE_DOCUMENTATION_TRUE@ rm -f xgen-doc xgen-man; \
- @GENERATE_DOCUMENTATION_TRUE@ echo; \
- @GENERATE_DOCUMENTATION_TRUE@ done; \
-@@ -808,7 +762,7 @@
- @GENERATE_DOCUMENTATION_FALSE@ @false
-
- @GENERATE_DOCUMENTATION_FALSE at doc-build.stamp:
-- at GENERATE_DOCUMENTATION_FALSE@ @if test ! -d $(srcdir)/html -a ! -d $(srcdir)/man; then \
-+ at GENERATE_DOCUMENTATION_FALSE@ @if test ! -d $(srcdir)/man; then \
- @GENERATE_DOCUMENTATION_FALSE@ echo; \
- @GENERATE_DOCUMENTATION_FALSE@ echo "*** No generated documentation found. If you want to"; \
- @GENERATE_DOCUMENTATION_FALSE@ echo "*** generate the (translated) documentation, run configure"; \
-@@ -827,10 +781,6 @@
- # include the html and man files in the dist
- dist-hook: dist-check-doc doc-build.stamp
- for lang in $(ALL_LINGUAS); do \
-- if test -d $(srcdir)/html/$$lang; then \
-- mkdir -p $(distdir)/html/$$lang; \
-- cp $(srcdir)/html/$$lang/* $(distdir)/html/$$lang/; \
-- fi; \
- if test -d $(srcdir)/man/$$lang; then \
- mkdir -p $(distdir)/man/$$lang; \
- cp $(srcdir)/man/$$lang/* $(distdir)/man/$$lang/; \
-
-
diff -urN /usr/ports/x11/Terminal/files/extra-patch-doc_Makefile.in Terminal/files/extra-patch-doc_Makefile.in
--- /usr/ports/x11/Terminal/files/extra-patch-doc_Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ Terminal/files/extra-patch-doc_Makefile.in 2011-06-22 18:38:57.000000000 +0200
@@ -0,0 +1,39 @@
+--- doc/Makefile.in.orig 2011-06-21 22:32:36.000000000 +0200
++++ doc/Makefile.in 2011-06-22 18:31:41.000000000 +0200
+@@ -293,7 +293,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+- images \
+ po
+
+ HTML_STYLESHEET = $(PACKAGE)-html.xsl
+@@ -632,7 +631,7 @@
+
+ info-am:
+
+-install-data-am: install-cssDATA install-data-local
++install-data-am: install-data-local
+
+ install-dvi: install-dvi-recursive
+
+@@ -700,19 +699,6 @@
+ # install the html files to the destdir
+ install-data-local:
+ for lang in $(ALL_LINGUAS); do \
+- if test -d $(srcdir)/html/$$lang; then \
+- dest=$(DESTDIR)$(docdir)/$$lang; \
+- $(mkinstalldirs) $$dest; \
+- installfiles=`echo $(srcdir)/html/$$lang/*`; \
+- for file in $$installfiles; do \
+- echo "--- Installing "$$file; \
+- $(INSTALL_DATA) $$file $$dest/; \
+- done; \
+- if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
+- echo "--- Creating symlink to C images for $$lang"; \
+- ln -sf ../C/images $$dest/images; \
+- fi \
+- fi; \
+ file=$(srcdir)/man/$$lang/$(PACKAGE_NAME).1; \
+ if test -f $$file ; then \
+ if test x"$$lang" = x"C"; then \
diff -urN /usr/ports/x11/Terminal/pkg-plist Terminal/pkg-plist
--- /usr/ports/x11/Terminal/pkg-plist 2011-04-14 14:00:56.000000000 +0200
+++ Terminal/pkg-plist 2011-06-22 18:38:57.000000000 +0200
@@ -254,22 +254,6 @@
%%NLS%%@dirrmtry share/locale/dz
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
- at dirrmtry man/zh_CN/man1
- at dirrmtry man/zh_CN
- at dirrmtry share/icons/hicolor/scalable/apps
- at dirrmtry share/icons/hicolor/scalable
- at dirrmtry share/icons/hicolor/48x48/stock/navigation
- at dirrmtry share/icons/hicolor/48x48/stock
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor/24x24/stock/navigation
- at dirrmtry share/icons/hicolor/24x24/stock
- at dirrmtry share/icons/hicolor/24x24
- at dirrmtry share/icons/hicolor/16x16/stock/navigation
- at dirrmtry share/icons/hicolor/16x16/stock
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/gnome-control-center/default-apps
- at dirrmtry share/gnome-control-center
%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ug
%%PORTDOCS%%@dirrm %%DOCSDIR%%/sv
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list