- style.Makefile(9) fix

  - first line is $FreeBSD$
  - Reorder special variables: DPADD, LPADD, CFLAGS
  - Use = instead of += for variables that are initially empty
  - Use space instead of tab after :
  - Use one tab after =
- Use .SUFFIXES for section 3 manual page which simplifies Makefile a lot
- Use SHAREDIR instead of /usr/share
- Remove SRCDIR in INCS since we set .PATH properly
- Use plural in variable name when it stands for more that one source file

Reviewed by:	ru
Approved by:	delphij (mentor)

1 files changed, 150 insertions, 151 deletions

diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index 6ef2aaa1db0b..d89b96b0c71f 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -1,165 +1,164 @@
-# Makefile for libform
 # $FreeBSD$
 
-.include	"${.CURDIR}/../config.mk"
+.include "${.CURDIR}/../config.mk"
 
-SRCDIR=		${NCURSES_DIR}/form
+SRCDIR=	${NCURSES_DIR}/form
 
-LIB=		form
-DPADD=		${LIBNCURSES}
-LDADD=		-lncurses
+LIB=	form
 
-.PATH:		${SRCDIR}
-SRCS=		\
-		ncurses_def.h \
-		fld_arg.c \
-		fld_attr.c \
-		fld_current.c \
-		fld_def.c \
-		fld_dup.c \
-		fld_ftchoice.c \
-		fld_ftlink.c \
-		fld_info.c \
-		fld_just.c \
-		fld_link.c \
-		fld_max.c \
-		fld_move.c \
-		fld_newftyp.c \
-		fld_opts.c \
-		fld_pad.c \
-		fld_page.c \
-		fld_stat.c \
-		fld_type.c \
-		fld_user.c \
-		frm_cursor.c \
-		frm_data.c \
-		frm_def.c \
-		frm_driver.c \
-		frm_hook.c \
-		frm_opts.c \
-		frm_page.c \
-		frm_post.c \
-		frm_req_name.c \
-		frm_scale.c \
-		frm_sub.c \
-		frm_user.c \
-		frm_win.c \
-		fty_alnum.c \
-		fty_alpha.c \
-		fty_enum.c \
-		fty_int.c \
-		fty_ipv4.c \
-		fty_num.c \
-		fty_regex.c
+.PATH: ${SRCDIR}
+SRCS=	\
+	ncurses_def.h \
+	fld_arg.c \
+	fld_attr.c \
+	fld_current.c \
+	fld_def.c \
+	fld_dup.c \
+	fld_ftchoice.c \
+	fld_ftlink.c \
+	fld_info.c \
+	fld_just.c \
+	fld_link.c \
+	fld_max.c \
+	fld_move.c \
+	fld_newftyp.c \
+	fld_opts.c \
+	fld_pad.c \
+	fld_page.c \
+	fld_stat.c \
+	fld_type.c \
+	fld_user.c \
+	frm_cursor.c \
+	frm_data.c \
+	frm_def.c \
+	frm_driver.c \
+	frm_hook.c \
+	frm_opts.c \
+	frm_page.c \
+	frm_post.c \
+	frm_req_name.c \
+	frm_scale.c \
+	frm_sub.c \
+	frm_user.c \
+	frm_win.c \
+	fty_alnum.c \
+	fty_alpha.c \
+	fty_enum.c \
+	fty_int.c \
+	fty_ipv4.c \
+	fty_num.c \
+	fty_regex.c
+
+CLEANFILES=	ncurses_def.h
 
 CFLAGS+=	-I${SRCDIR}
 CFLAGS+=	-I${NCURSES_DIR}/menu
 
-INCS=		${SRCDIR}/form.h
+DPADD=	${LIBNCURSES}
+LDADD=	-lncurses
+
+INCS=	form.h
 
-CLEANFILES+=	ncurses_def.h
+.PATH: ${NCURSES_DIR}/man
+MAN=	\
+	form.3 \
+	form_cursor.3 \
+	form_data.3 \
+	form_driver.3 \
+	form_field.3 \
+	form_field_attributes.3 \
+	form_field_buffer.3 \
+	form_field_info.3 \
+	form_field_just.3 \
+	form_field_new.3 \
+	form_field_opts.3 \
+	form_field_userptr.3 \
+	form_field_validation.3 \
+	form_fieldtype.3 \
+	form_hook.3 \
+	form_new.3 \
+	form_new_page.3 \
+	form_opts.3 \
+	form_page.3 \
+	form_post.3 \
+	form_requestname.3 \
+	form_userptr.3 \
+	form_win.3
 
-.PATH:		${NCURSES_DIR}/man
-MANx=		\
-		form.3x \
-		form_cursor.3x \
-		form_data.3x \
-		form_driver.3x \
-		form_field.3x \
-		form_field_attributes.3x \
-		form_field_buffer.3x \
-		form_field_info.3x \
-		form_field_just.3x \
-		form_field_new.3x \
-		form_field_opts.3x \
-		form_field_userptr.3x \
-		form_field_validation.3x \
-		form_fieldtype.3x \
-		form_hook.3x \
-		form_new.3x \
-		form_new_page.3x \
-		form_opts.3x \
-		form_page.3x \
-		form_post.3x \
-		form_requestname.3x \
-		form_userptr.3x \
-		form_win.3x
-	
-# Generate the MAN list from MANx
-.for page in ${MANx}
-CLEANFILES+=	${page:T:S/x$//g}
-MAN+=		${page:T:S/x$//g}
-${page:T:S/x$//g}: ${page}
-	cat ${.ALLSRC} > ${.TARGET}
-.endfor
+CLEANFILES+=	${MAN:M*.3}
 
-MLINKS=		form_cursor.3 pos_form_cursor.3 \
-		form_data.3 data_ahead.3 \
-		form_data.3 data_behind.3 \
-		form_field.3 field_count.3 \
-		form_field.3 form_fields.3 \
-		form_field.3 move_field.3 \
-		form_field.3 set_form_fields.3 \
-		form_field_attributes.3 field_back.3 \
-		form_field_attributes.3 field_fore.3 \
-		form_field_attributes.3 field_pad.3 \
-		form_field_attributes.3 set_field_back.3 \
-		form_field_attributes.3 set_field_fore.3 \
-		form_field_attributes.3 set_field_pad.3 \
-		form_field_buffer.3 field_buffer.3 \
-		form_field_buffer.3 field_status.3 \
-		form_field_buffer.3 set_field_buffer.3 \
-		form_field_buffer.3 set_field_status.3 \
-		form_field_buffer.3 set_max_field.3 \
-		form_field_info.3 dynamic_fieldinfo.3 \
-		form_field_info.3 field_info.3 \
-		form_field_just.3 field_just.3 \
-		form_field_just.3 set_field_just.3 \
-		form_field_new.3 dup_field.3 \
-		form_field_new.3 free_field.3 \
-		form_field_new.3 link_field.3 \
-		form_field_new.3 new_field.3 \
-		form_field_opts.3 field_opts.3 \
-		form_field_opts.3 field_opts_off.3 \
-		form_field_opts.3 field_opts_on.3 \
-		form_field_opts.3 set_field_opts.3 \
-		form_field_userptr.3 field_userptr.3 \
-		form_field_userptr.3 set_field_userptr.3 \
-		form_field_validation.3 field_arg.3 \
-		form_field_validation.3 field_type.3 \
-		form_field_validation.3 set_field_type.3 \
-		form_fieldtype.3 free_fieldtype.3 \
-		form_fieldtype.3 link_fieldtype.3 \
-		form_fieldtype.3 new_fieldtype.3 \
-		form_fieldtype.3 set_fieldtype_arg.3 \
-		form_fieldtype.3 set_fieldtype_choice.3 \
-		form_hook.3 field_init.3 \
-		form_hook.3 field_term.3 \
-		form_hook.3 form_init.3 \
-		form_hook.3 form_term.3 \
-		form_hook.3 set_field_init.3 \
-		form_hook.3 set_field_term.3 \
-		form_hook.3 set_form_init.3 \
-		form_hook.3 set_form_term.3 \
-		form_new.3 free_form.3 \
-		form_new.3 new_form.3 \
-		form_new_page.3 new_page.3 \
-		form_new_page.3 set_new_page.3 \
-		form_opts.3 form_opts_off.3 \
-		form_opts.3 form_opts_on.3 \
-		form_opts.3 set_form_opts.3 \
-		form_page.3 current_field.3 \
-		form_page.3 field_index.3 \
-		form_page.3 set_current_field.3 \
-		form_page.3 set_form_page.3 \
-		form_post.3 post_form.3 \
-		form_post.3 unpost_form.3 \
-		form_requestname.3 form_request_by_name.3 \
-		form_requestname.3 form_request_name.3 \
-		form_userptr.3 set_form_userptr.3 \
-		form_win.3 form_sub.3 \
-		form_win.3 scale_form.3 \
-		form_win.3 set_form_sub.3 \
-		form_win.3 set_form_win.3
+MLINKS=	form_cursor.3 pos_form_cursor.3 \
+	form_data.3 data_ahead.3 \
+	form_data.3 data_behind.3 \
+	form_field.3 field_count.3 \
+	form_field.3 form_fields.3 \
+	form_field.3 move_field.3 \
+	form_field.3 set_form_fields.3 \
+	form_field_attributes.3 field_back.3 \
+	form_field_attributes.3 field_fore.3 \
+	form_field_attributes.3 field_pad.3 \
+	form_field_attributes.3 set_field_back.3 \
+	form_field_attributes.3 set_field_fore.3 \
+	form_field_attributes.3 set_field_pad.3 \
+	form_field_buffer.3 field_buffer.3 \
+	form_field_buffer.3 field_status.3 \
+	form_field_buffer.3 set_field_buffer.3 \
+	form_field_buffer.3 set_field_status.3 \
+	form_field_buffer.3 set_max_field.3 \
+	form_field_info.3 dynamic_fieldinfo.3 \
+	form_field_info.3 field_info.3 \
+	form_field_just.3 field_just.3 \
+	form_field_just.3 set_field_just.3 \
+	form_field_new.3 dup_field.3 \
+	form_field_new.3 free_field.3 \
+	form_field_new.3 link_field.3 \
+	form_field_new.3 new_field.3 \
+	form_field_opts.3 field_opts.3 \
+	form_field_opts.3 field_opts_off.3 \
+	form_field_opts.3 field_opts_on.3 \
+	form_field_opts.3 set_field_opts.3 \
+	form_field_userptr.3 field_userptr.3 \
+	form_field_userptr.3 set_field_userptr.3 \
+	form_field_validation.3 field_arg.3 \
+	form_field_validation.3 field_type.3 \
+	form_field_validation.3 set_field_type.3 \
+	form_fieldtype.3 free_fieldtype.3 \
+	form_fieldtype.3 link_fieldtype.3 \
+	form_fieldtype.3 new_fieldtype.3 \
+	form_fieldtype.3 set_fieldtype_arg.3 \
+	form_fieldtype.3 set_fieldtype_choice.3 \
+	form_hook.3 field_init.3 \
+	form_hook.3 field_term.3 \
+	form_hook.3 form_init.3 \
+	form_hook.3 form_term.3 \
+	form_hook.3 set_field_init.3 \
+	form_hook.3 set_field_term.3 \
+	form_hook.3 set_form_init.3 \
+	form_hook.3 set_form_term.3 \
+	form_new.3 free_form.3 \
+	form_new.3 new_form.3 \
+	form_new_page.3 new_page.3 \
+	form_new_page.3 set_new_page.3 \
+	form_opts.3 form_opts_off.3 \
+	form_opts.3 form_opts_on.3 \
+	form_opts.3 set_form_opts.3 \
+	form_page.3 current_field.3 \
+	form_page.3 field_index.3 \
+	form_page.3 set_current_field.3 \
+	form_page.3 set_form_page.3 \
+	form_post.3 post_form.3 \
+	form_post.3 unpost_form.3 \
+	form_requestname.3 form_request_by_name.3 \
+	form_requestname.3 form_request_name.3 \
+	form_userptr.3 set_form_userptr.3 \
+	form_win.3 form_sub.3 \
+	form_win.3 scale_form.3 \
+	form_win.3 set_form_sub.3 \
+	form_win.3 set_form_win.3
 
 .include <bsd.lib.mk>
+
+# Keep the .SUFFIXES line after the include of bsd.lib.mk
+.SUFFIXES: .3 .3x
+.3x.3:
+	cat ${.IMPSRC} > ${.TARGET}