Clean-up and drop maintainership.

PR:		64023
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>

2 files changed, 32 insertions, 29 deletions

diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index 64697c30b9e5..624a00f01e6c 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	cyrille.lefevre@laposte.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual Widgets for the Fast Light ToolKit
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
@@ -25,11 +25,13 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	DIRS=src
 
+PLIST_SUB=	INCSDIR="${INCSDIR:S,^${PREFIX}/,,}"
+
+INCSDIR=	${PREFIX}/include/FL
+
 DOC_FILES=	documentation/html/*.html
-DOC_SUBDIR=	share/doc/${PKGBASE}
 INC_FILES=	Flv_CStyle.H Flv_Data_Source.H Flv_List.H Flv_Style.H \
 		Flv_Table.H Flve_Check_Button.H Flve_Combo.H Flve_Input.H
-INC_SUBDIR=	include/FL
 
 INSTALLS_SHLIB=	yes
 
@@ -47,14 +49,14 @@ post-install: symlink-inc install-doc
 
 symlink-inc:
 .for file in ${INC_FILES}
-	@${LN} -fs ${file} ${PREFIX}/${INC_SUBDIR}/${file:R}.${file:E:L}
+	@${LN} -fs ${file} ${INCSDIR}/${file:R}.${file:E:L}
 .endfor
 
 install-doc:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
+	@${MKDIR} ${DOCSDIR}
 .for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-toolkits/flvw/pkg-plist b/x11-toolkits/flvw/pkg-plist
index 4aa1c3006662..5fd819426aeb 100644
--- a/x11-toolkits/flvw/pkg-plist
+++ b/x11-toolkits/flvw/pkg-plist
@@ -1,43 +1,44 @@
 @comment $FreeBSD$
-include/FL/Flv_CStyle.H
+%%INCSDIR%%/Flv_CStyle.H
 @exec ln -fs %f %B/Flv_CStyle.h
 @unexec rm -f %B/Flv_CStyle.h
-include/FL/Flv_Data_Source.H
+%%INCSDIR%%/Flv_Data_Source.H
 @exec ln -fs %f %B/Flv_Data_Source.h
 @unexec rm -f %B/Flv_Data_Source.h
-include/FL/Flv_List.H
+%%INCSDIR%%/Flv_List.H
 @exec ln -fs %f %B/Flv_List.h
 @unexec rm -f %B/Flv_List.h
-include/FL/Flv_Style.H
+%%INCSDIR%%/Flv_Style.H
 @exec ln -fs %f %B/Flv_Style.h
 @unexec rm -f %B/Flv_Style.h
-include/FL/Flv_Table.H
+%%INCSDIR%%/Flv_Table.H
 @exec ln -fs %f %B/Flv_Table.h
 @unexec rm -f %B/Flv_Table.h
-include/FL/Flve_Check_Button.H
+%%INCSDIR%%/Flve_Check_Button.H
 @exec ln -fs %f %B/Flve_Check_Button.h
 @unexec rm -f %B/Flve_Check_Button.h
-include/FL/Flve_Combo.H
+%%INCSDIR%%/Flve_Combo.H
 @exec ln -fs %f %B/Flve_Combo.h
 @unexec rm -f %B/Flve_Combo.h
-include/FL/Flve_Input.H
+%%INCSDIR%%/Flve_Input.H
 @exec ln -fs %f %B/Flve_Input.h
 @unexec rm -f %B/Flve_Input.h
 lib/libflvw.a
 lib/libflvw.so.1
 @exec ln -fs %f %B/libflvw.so
 @unexec rm -f %B/libflvw.so
-%%PORTDOCS%%share/doc/flvw/basics.html
-%%PORTDOCS%%share/doc/flvw/callbacks.html
-%%PORTDOCS%%share/doc/flvw/classref.html
-%%PORTDOCS%%share/doc/flvw/flv_ctable.html
-%%PORTDOCS%%share/doc/flvw/flv_list.html
-%%PORTDOCS%%share/doc/flvw/flv_style.html
-%%PORTDOCS%%share/doc/flvw/flv_style_list.html
-%%PORTDOCS%%share/doc/flvw/flv_table.html
-%%PORTDOCS%%share/doc/flvw/index.html
-%%PORTDOCS%%share/doc/flvw/intro.html
-%%PORTDOCS%%share/doc/flvw/scroll_bar.html
-%%PORTDOCS%%share/doc/flvw/stylebasics.html
-%%PORTDOCS%%share/doc/flvw/widget_features.html
-%%PORTDOCS%%@dirrm share/doc/flvw
+%%PORTDOCS%%%%DOCSDIR%%/basics.html
+%%PORTDOCS%%%%DOCSDIR%%/callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/classref.html
+%%PORTDOCS%%%%DOCSDIR%%/flv_ctable.html
+%%PORTDOCS%%%%DOCSDIR%%/flv_list.html
+%%PORTDOCS%%%%DOCSDIR%%/flv_style.html
+%%PORTDOCS%%%%DOCSDIR%%/flv_style_list.html
+%%PORTDOCS%%%%DOCSDIR%%/flv_table.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/scroll_bar.html
+%%PORTDOCS%%%%DOCSDIR%%/stylebasics.html
+%%PORTDOCS%%%%DOCSDIR%%/widget_features.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %%INCSDIR%% 2> /dev/null || :