pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ircd-hybrid: Do not require pax



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Jan 28 02:22:31 2019 +0100
Changeset:	bc070e3bc39a3dbc41eb3f2468bac203fdf89585

Modified Files:
	ircd-hybrid/Makefile
	ircd-hybrid/PLIST

Log Message:
ircd-hybrid: Do not require pax

All doc files can be handled directly via INSTALL_DATA{,_DIR} easily
without requiring pax. Given that the interesting files are *.txt
and *.conf just glob them in order to manually remove Makefile-s
and to not install other non-documentation files and already
installed man page.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bc070e3bc39a3dbc41eb3f2468bac203fdf89585

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ircd-hybrid/Makefile | 9 ++++-----
 ircd-hybrid/PLIST    | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs:
diff --git a/ircd-hybrid/Makefile b/ircd-hybrid/Makefile
index 9e8864778b..68f7b4d0b4 100644
--- a/ircd-hybrid/Makefile
+++ b/ircd-hybrid/Makefile
@@ -12,8 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	ircu-[0-9]*
 
-USE_TOOLS+=	pax
-
 GNU_CONFIGURE=	YES
 BUILD_DEFS+=	VARBASE IRCD_HYBRID_IRC_USER IRCD_HYBRID_IRC_GROUP
 
@@ -71,9 +69,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/README.mkpasswd \
 		${DESTDIR}${HYBRID_DOC}/README.ircd-hybrid-mkpasswd
 
-	${RM} ${WRKSRC}/doc/Makefile
-	${RM} ${WRKSRC}/doc/Makefile.in
-	cd ${WRKSRC}/doc && pax -s',.*\.orig$$,,' -rwppm . ${DESTDIR}${HYBRID_DOC}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/*.conf ${DESTDIR}${HYBRID_DOC}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${HYBRID_DOC}/doc
+	${INSTALL_DATA_DIR} ${DESTDIR}${HYBRID_DOC}/doc/technical
+	${INSTALL_DATA} ${WRKSRC}/doc/technical/*.txt ${DESTDIR}${HYBRID_DOC}/doc/technical
 
 	${MV} ${DESTDIR}${PREFIX}/bin/mkpasswd \
 		${DESTDIR}${PREFIX}/bin/ircd-hybrid-mkpasswd
diff --git a/ircd-hybrid/PLIST b/ircd-hybrid/PLIST
index a9937f679b..260398c57e 100644
--- a/ircd-hybrid/PLIST
+++ b/ircd-hybrid/PLIST
@@ -86,10 +86,7 @@ share/doc/ircd-hybrid/INSTALL
 share/doc/ircd-hybrid/README
 share/doc/ircd-hybrid/README.ircd-hybrid-mkpasswd
 share/doc/ircd-hybrid/doc/CIDR.txt
-share/doc/ircd-hybrid/doc/Doxyfile
-share/doc/ircd-hybrid/doc/Makefile.am
 share/doc/ircd-hybrid/doc/index.txt
-share/doc/ircd-hybrid/doc/ircd.8
 share/doc/ircd-hybrid/doc/kline.txt
 share/doc/ircd-hybrid/doc/modeg.txt
 share/doc/ircd-hybrid/doc/modes.txt


Home | Main Index | Thread Index | Old Index