Date: Tue, 7 May 2013 14:45:57 +0200 (CEST) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/178394: [patch] print/pslib conditionally use gettext Message-ID: <201305071245.r47CjvCY032460@freefall.freebsd.org> Resent-Message-ID: <201305071250.r47Co1WQ032576@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178394
>Category: ports
>Synopsis: [patch] print/pslib conditionally use gettext
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue May 07 12:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Emanuel Haupt
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r249172: Sat Apr 6 00:40:01 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
- Only require gettext if needed
- Don't use bsd.port.pre.mk and therefore
- Adjust manpage handling
>How-To-Repeat:
>Fix:
--- pslib.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 317551)
+++ Makefile (working copy)
@@ -14,7 +14,7 @@
png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-USES= pathfix pkgconfig gettext
+USES= pathfix pkgconfig
USE_GNOME= intlhack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
@@ -26,7 +26,7 @@
OPTIONS_DEFAULT= MAN NLS
MAN_DESC= Manual pages
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MEXAMPLES}
EX_NAME= pslib-examples-0.0.10
@@ -40,13 +40,14 @@
.if ${PORT_OPTIONS:MMAN}
BUILD_DEPENDS+= ${LOCALBASE}/bin/docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils
-MAN3!= ${CAT} ${FILESDIR}/man3
+.include "${.CURDIR}/Makefile.man"
.else
# Avoid building the manpages.
CONFIGURE_ENV+= ac_cv_prog_DOC_TO_MAN=""
.endif
.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ENV+= ac_cv_header_libintl_h=no
@@ -66,4 +67,4 @@
cd ${EX_WRKSRC} && ${PAX} -rw * ${EXAMPLESDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: Makefile.man
===================================================================
--- Makefile.man (revision 0)
+++ Makefile.man (working copy)
@@ -0,0 +1,102 @@
+MAN3+=PS_add_bookmark.3
+MAN3+=PS_add_kerning.3
+MAN3+=PS_add_launchlink.3
+MAN3+=PS_add_ligature.3
+MAN3+=PS_add_locallink.3
+MAN3+=PS_add_note.3
+MAN3+=PS_add_pdflink.3
+MAN3+=PS_add_weblink.3
+MAN3+=PS_arc.3
+MAN3+=PS_arcn.3
+MAN3+=PS_begin_font.3
+MAN3+=PS_begin_glyph.3
+MAN3+=PS_begin_page.3
+MAN3+=PS_begin_pattern.3
+MAN3+=PS_begin_template.3
+MAN3+=PS_boot.3
+MAN3+=PS_circle.3
+MAN3+=PS_clip.3
+MAN3+=PS_close.3
+MAN3+=PS_close_image.3
+MAN3+=PS_closepath.3
+MAN3+=PS_closepath_stroke.3
+MAN3+=PS_continue_text.3
+MAN3+=PS_continue_text2.3
+MAN3+=PS_create_gstate.3
+MAN3+=PS_curveto.3
+MAN3+=PS_delete.3
+MAN3+=PS_end_font.3
+MAN3+=PS_end_glyph.3
+MAN3+=PS_end_page.3
+MAN3+=PS_end_pattern.3
+MAN3+=PS_end_template.3
+MAN3+=PS_fill.3
+MAN3+=PS_fill_stroke.3
+MAN3+=PS_findfont.3
+MAN3+=PS_free_glyph_list.3
+MAN3+=PS_get_buffer.3
+MAN3+=PS_get_majorversion.3
+MAN3+=PS_get_minorversion.3
+MAN3+=PS_get_opaque.3
+MAN3+=PS_get_parameter.3
+MAN3+=PS_get_subminorversion.3
+MAN3+=PS_get_value.3
+MAN3+=PS_glyph_list.3
+MAN3+=PS_glyph_show.3
+MAN3+=PS_hyphenate.3
+MAN3+=PS_include_file.3
+MAN3+=PS_lineto.3
+MAN3+=PS_list_parameters.3
+MAN3+=PS_list_resources.3
+MAN3+=PS_list_values.3
+MAN3+=PS_makespotcolor.3
+MAN3+=PS_moveto.3
+MAN3+=PS_new.3
+MAN3+=PS_new2.3
+MAN3+=PS_open_file.3
+MAN3+=PS_open_fp.3
+MAN3+=PS_open_image.3
+MAN3+=PS_open_image_file.3
+MAN3+=PS_open_mem.3
+MAN3+=PS_place_image.3
+MAN3+=PS_rect.3
+MAN3+=PS_restore.3
+MAN3+=PS_rotate.3
+MAN3+=PS_save.3
+MAN3+=PS_scale.3
+MAN3+=PS_set_border_color.3
+MAN3+=PS_set_border_dash.3
+MAN3+=PS_set_border_style.3
+MAN3+=PS_set_gstate.3
+MAN3+=PS_set_info.3
+MAN3+=PS_set_parameter.3
+MAN3+=PS_set_text_pos.3
+MAN3+=PS_set_value.3
+MAN3+=PS_setcolor.3
+MAN3+=PS_setdash.3
+MAN3+=PS_setflat.3
+MAN3+=PS_setfont.3
+MAN3+=PS_setgray.3
+MAN3+=PS_setlinecap.3
+MAN3+=PS_setlinejoin.3
+MAN3+=PS_setlinewidth.3
+MAN3+=PS_setmiterlimit.3
+MAN3+=PS_setpolydash.3
+MAN3+=PS_shading.3
+MAN3+=PS_shading_pattern.3
+MAN3+=PS_shfill.3
+MAN3+=PS_show.3
+MAN3+=PS_show2.3
+MAN3+=PS_show_boxed.3
+MAN3+=PS_show_xy.3
+MAN3+=PS_show_xy2.3
+MAN3+=PS_shutdown.3
+MAN3+=PS_string_geometry.3
+MAN3+=PS_stringwidth.3
+MAN3+=PS_stringwidth2.3
+MAN3+=PS_stroke.3
+MAN3+=PS_symbol.3
+MAN3+=PS_symbol_name.3
+MAN3+=PS_symbol_width.3
+MAN3+=PS_translate.3
+MAN3+=pslib.3
Property changes on: Makefile.man
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: files/man3
===================================================================
--- files/man3 (revision 317545)
+++ files/man3 (working copy)
@@ -1,102 +0,0 @@
-PS_add_bookmark.3
-PS_add_kerning.3
-PS_add_launchlink.3
-PS_add_ligature.3
-PS_add_locallink.3
-PS_add_note.3
-PS_add_pdflink.3
-PS_add_weblink.3
-PS_arc.3
-PS_arcn.3
-PS_begin_font.3
-PS_begin_glyph.3
-PS_begin_page.3
-PS_begin_pattern.3
-PS_begin_template.3
-PS_boot.3
-PS_circle.3
-PS_clip.3
-PS_close.3
-PS_close_image.3
-PS_closepath.3
-PS_closepath_stroke.3
-PS_continue_text.3
-PS_continue_text2.3
-PS_create_gstate.3
-PS_curveto.3
-PS_delete.3
-PS_end_font.3
-PS_end_glyph.3
-PS_end_page.3
-PS_end_pattern.3
-PS_end_template.3
-PS_fill.3
-PS_fill_stroke.3
-PS_findfont.3
-PS_free_glyph_list.3
-PS_get_buffer.3
-PS_get_majorversion.3
-PS_get_minorversion.3
-PS_get_opaque.3
-PS_get_parameter.3
-PS_get_subminorversion.3
-PS_get_value.3
-PS_glyph_list.3
-PS_glyph_show.3
-PS_hyphenate.3
-PS_include_file.3
-PS_lineto.3
-PS_list_parameters.3
-PS_list_resources.3
-PS_list_values.3
-PS_makespotcolor.3
-PS_moveto.3
-PS_new.3
-PS_new2.3
-PS_open_file.3
-PS_open_fp.3
-PS_open_image.3
-PS_open_image_file.3
-PS_open_mem.3
-PS_place_image.3
-PS_rect.3
-PS_restore.3
-PS_rotate.3
-PS_save.3
-PS_scale.3
-PS_set_border_color.3
-PS_set_border_dash.3
-PS_set_border_style.3
-PS_set_gstate.3
-PS_set_info.3
-PS_set_parameter.3
-PS_set_text_pos.3
-PS_set_value.3
-PS_setcolor.3
-PS_setdash.3
-PS_setflat.3
-PS_setfont.3
-PS_setgray.3
-PS_setlinecap.3
-PS_setlinejoin.3
-PS_setlinewidth.3
-PS_setmiterlimit.3
-PS_setpolydash.3
-PS_shading.3
-PS_shading_pattern.3
-PS_shfill.3
-PS_show.3
-PS_show2.3
-PS_show_boxed.3
-PS_show_xy.3
-PS_show_xy2.3
-PS_shutdown.3
-PS_string_geometry.3
-PS_stringwidth.3
-PS_stringwidth2.3
-PS_stroke.3
-PS_symbol.3
-PS_symbol_name.3
-PS_symbol_width.3
-PS_translate.3
-pslib.3
--- pslib.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305071245.r47CjvCY032460>