mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

irc/nefarious: stage, take 2. Add DOCS options

Browse Source 
The vendor makefile creates html documents unconditionally with two
flavors: operators and users.  There is a lot of duplication between the
two so it symlinked the duplicates.  Unfortunately the symlinks point
back the stage directory.  Also, at least one symlink was invalid in all
cases as it was not pointing to any file.

To fix:
 1. override install target
 2. Add DOCS option to make non-man page documentation optional
 3. Copy files instead of using symlinks (they are very small)
 4. Fix vendor SYMLINK list, there were two errors in it
 5. Remove subversion tree during post-extract target

Note that the permissions of the installed configuration files are
different.  The vendor files tried to install them with modes 600 and 700
but now they are the default for INSTALL_DATA macro.

Reported by:	swills (jenkins)
This commit is contained in:
John Marino 2014-07-06 08:44:59 +00:00
parent 07a982e18a
commit 7b0124e574
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=360864
2 changed files with 150 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
irc/nefarious/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= Nefarious
PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= SF/evilnet/${PORTNAME}%20IRCu/${PORTVERSION}
@ -14,9 +15,10 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USES= tar:bzip2
HAS_CONFIGURE= yes
BINMODE= 711
PLIST_SUB+= INSTALL_PREFIX=${INSTALL_PREFIX:S/${PREFIX}\///}
OPTIONS_DEFINE= SSL CHROOT
OPTIONS_DEFINE= SSL CHROOT DOCS
CHROOT_DESC= Chroot the irc daemon within INSTALL_PREFIX
SSL_CONFIGURE_ENABLE= ssl
@ -28,6 +30,7 @@ INSTALL_PREFIX=${NEFARIUS_INSTALL_PREFIX}
.else
INSTALL_PREFIX=${PREFIX}/${PORTNAME}
.endif
STAGEPREFIX=${STAGEDIR}${INSTALL_PREFIX}
.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL= yes
@ -41,17 +44,39 @@ CONFIGURE_ARGS+= --with-chroot=${INSTALL_PREFIX}
CONFIGURE_ARGS+= --with-domain=${NEFARIOUS_DOMAIN}
.endif
CONFIGURE_ARGS+= --prefix=${STAGEDIR}${INSTALL_PREFIX} \
--mandir=${STAGEDIR}${MANPREFIX}/man
CONFIGURE_ARGS+= --prefix=${INSTALL_PREFIX} \
--mandir=${MANPREFIX}/man
SYMLINKS= admin away challenge invite names nick version \
join kick motd oper part quit time cnotice \
cprivmsg credits copyright info ircops ison links \
lusers map notice pass rules silence sethost topic \
userhost userip wallchops wallhops wallvoices whois \
commands
post-extract:
@${FIND} ${WRKSRC} -type d -name ".svn" | ${XARGS} ${RM} -rf
post-patch:
@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/configure
pre-configure:
@${ECHO_CMD}
@${ECHO_CMD} "User configurable options for ${PORTNAME}:"
@${ECHO_CMD} "NEFARIOUS_INSTALL_PREFIX - Install location for Nefarious (default: ${PREFIX}/Nefarious)"
@${ECHO_CMD} "NEFARIOUS_INSTALL_PREFIX - Install location for Nefarious"
@${ECHO_CMD} " (default: ${PREFIX}/Nefarious)"
@${ECHO_CMD} "NEFARIOUS_DOMAIN - Domain to use for IRCd"
@${ECHO_CMD}
do-install:
${MKDIR} ${STAGEPREFIX}/bin ${STAGEPREFIX}/lib/help
${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${STAGEPREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/ircd/chkconf ${STAGEPREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEPREFIX}/lib
${INSTALL_MAN} ${WRKSRC}/doc/ircd.8 ${STAGEDIR}${MANPREFIX}/man/man8
.if ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC}/help && \
${COPYTREE_SHARE} users ${STAGEPREFIX}/lib/help && \
${COPYTREE_SHARE} opers ${STAGEPREFIX}/lib/help
cd ${STAGEPREFIX}/lib/help/opers && ${CP} ${SYMLINKS} ../users
.endif
.include <bsd.port.mk>

239
irc/nefarious/pkg-plist
View File

@ -2,126 +2,125 @@ man/man8/ircd.8.gz
%%INSTALL_PREFIX%%/bin/ircd
%%INSTALL_PREFIX%%/bin/chkconf
%%INSTALL_PREFIX%%/lib/example.conf
%%INSTALL_PREFIX%%/lib/help/users/channelmodes
%%INSTALL_PREFIX%%/lib/help/users/gline
%%INSTALL_PREFIX%%/lib/help/users/index
%%INSTALL_PREFIX%%/lib/help/users/list
%%INSTALL_PREFIX%%/lib/help/users/shun
%%INSTALL_PREFIX%%/lib/help/users/stats
%%INSTALL_PREFIX%%/lib/help/users/usermodes
%%INSTALL_PREFIX%%/lib/help/users/who
%%INSTALL_PREFIX%%/lib/help/users/zline
%%INSTALL_PREFIX%%/lib/help/users/admin
%%INSTALL_PREFIX%%/lib/help/users/away
%%INSTALL_PREFIX%%/lib/help/users/challenge
%%INSTALL_PREFIX%%/lib/help/users/invite
%%INSTALL_PREFIX%%/lib/help/users/names
%%INSTALL_PREFIX%%/lib/help/users/nick
%%INSTALL_PREFIX%%/lib/help/users/version
%%INSTALL_PREFIX%%/lib/help/users/ison
%%INSTALL_PREFIX%%/lib/help/users/join
%%INSTALL_PREFIX%%/lib/help/users/kick
%%INSTALL_PREFIX%%/lib/help/users/help
%%INSTALL_PREFIX%%/lib/help/users/motd
%%INSTALL_PREFIX%%/lib/help/users/oper
%%INSTALL_PREFIX%%/lib/help/users/part
%%INSTALL_PREFIX%%/lib/help/users/quit
%%INSTALL_PREFIX%%/lib/help/users/time
%%INSTALL_PREFIX%%/lib/help/users/cnotice
%%INSTALL_PREFIX%%/lib/help/users/cprivmsg
%%INSTALL_PREFIX%%/lib/help/users/credits
%%INSTALL_PREFIX%%/lib/help/users/copyright
%%INSTALL_PREFIX%%/lib/help/users/info
%%INSTALL_PREFIX%%/lib/help/users/ircops
%%INSTALL_PREFIX%%/lib/help/users/links
%%INSTALL_PREFIX%%/lib/help/users/lusers
%%INSTALL_PREFIX%%/lib/help/users/map
%%INSTALL_PREFIX%%/lib/help/users/notice
%%INSTALL_PREFIX%%/lib/help/users/pass
%%INSTALL_PREFIX%%/lib/help/users/rules
%%INSTALL_PREFIX%%/lib/help/users/silence
%%INSTALL_PREFIX%%/lib/help/users/sethost
%%INSTALL_PREFIX%%/lib/help/users/topic
%%INSTALL_PREFIX%%/lib/help/users/userhost
%%INSTALL_PREFIX%%/lib/help/users/userip
%%INSTALL_PREFIX%%/lib/help/users/wallchops
%%INSTALL_PREFIX%%/lib/help/users/wallhops
%%INSTALL_PREFIX%%/lib/help/users/wallvoices
%%INSTALL_PREFIX%%/lib/help/users/whois
%%INSTALL_PREFIX%%/lib/help/users/commands
%%INSTALL_PREFIX%%/lib/help/opers/admin
%%INSTALL_PREFIX%%/lib/help/opers/away
%%INSTALL_PREFIX%%/lib/help/opers/challenge
%%INSTALL_PREFIX%%/lib/help/opers/channelmodes
%%INSTALL_PREFIX%%/lib/help/opers/check
%%INSTALL_PREFIX%%/lib/help/opers/clearmode
%%INSTALL_PREFIX%%/lib/help/opers/close
%%INSTALL_PREFIX%%/lib/help/opers/cnotice
%%INSTALL_PREFIX%%/lib/help/opers/commands
%%INSTALL_PREFIX%%/lib/help/opers/connect
%%INSTALL_PREFIX%%/lib/help/opers/copyright
%%INSTALL_PREFIX%%/lib/help/opers/cprivmsg
%%INSTALL_PREFIX%%/lib/help/opers/credits
%%INSTALL_PREFIX%%/lib/help/opers/die
%%INSTALL_PREFIX%%/lib/help/opers/dns
%%INSTALL_PREFIX%%/lib/help/opers/exempt
%%INSTALL_PREFIX%%/lib/help/opers/get
%%INSTALL_PREFIX%%/lib/help/opers/gline
%%INSTALL_PREFIX%%/lib/help/opers/globops
%%INSTALL_PREFIX%%/lib/help/opers/hash
%%INSTALL_PREFIX%%/lib/help/opers/index
%%INSTALL_PREFIX%%/lib/help/opers/info
%%INSTALL_PREFIX%%/lib/help/opers/invite
%%INSTALL_PREFIX%%/lib/help/opers/ircops
%%INSTALL_PREFIX%%/lib/help/opers/ison
%%INSTALL_PREFIX%%/lib/help/opers/join
%%INSTALL_PREFIX%%/lib/help/opers/kick
%%INSTALL_PREFIX%%/lib/help/opers/kill
%%INSTALL_PREFIX%%/lib/help/opers/links
%%INSTALL_PREFIX%%/lib/help/opers/list
%%INSTALL_PREFIX%%/lib/help/opers/lusers
%%INSTALL_PREFIX%%/lib/help/opers/map
%%INSTALL_PREFIX%%/lib/help/opers/mkpasswd
%%INSTALL_PREFIX%%/lib/help/opers/motd
%%INSTALL_PREFIX%%/lib/help/opers/names
%%INSTALL_PREFIX%%/lib/help/opers/nick
%%INSTALL_PREFIX%%/lib/help/opers/notice
%%INSTALL_PREFIX%%/lib/help/opers/oper
%%INSTALL_PREFIX%%/lib/help/opers/opermotd
%%INSTALL_PREFIX%%/lib/help/opers/opmode
%%INSTALL_PREFIX%%/lib/help/opers/part
%%INSTALL_PREFIX%%/lib/help/opers/pass
%%INSTALL_PREFIX%%/lib/help/opers/privs
%%INSTALL_PREFIX%%/lib/help/opers/quit
%%INSTALL_PREFIX%%/lib/help/opers/rehash
%%INSTALL_PREFIX%%/lib/help/opers/reset
%%INSTALL_PREFIX%%/lib/help/opers/restart
%%INSTALL_PREFIX%%/lib/help/opers/rules
%%INSTALL_PREFIX%%/lib/help/opers/set
%%INSTALL_PREFIX%%/lib/help/opers/sethost
%%INSTALL_PREFIX%%/lib/help/opers/settime
%%INSTALL_PREFIX%%/lib/help/opers/shun
%%INSTALL_PREFIX%%/lib/help/opers/silence
%%INSTALL_PREFIX%%/lib/help/opers/snomasks
%%INSTALL_PREFIX%%/lib/help/opers/squit
%%INSTALL_PREFIX%%/lib/help/opers/stats
%%INSTALL_PREFIX%%/lib/help/opers/time
%%INSTALL_PREFIX%%/lib/help/opers/topic
%%INSTALL_PREFIX%%/lib/help/opers/trace
%%INSTALL_PREFIX%%/lib/help/opers/uhelp
%%INSTALL_PREFIX%%/lib/help/opers/who
%%INSTALL_PREFIX%%/lib/help/opers/userhost
%%INSTALL_PREFIX%%/lib/help/opers/userip
%%INSTALL_PREFIX%%/lib/help/opers/usermodes
%%INSTALL_PREFIX%%/lib/help/opers/version
%%INSTALL_PREFIX%%/lib/help/opers/wallchops
%%INSTALL_PREFIX%%/lib/help/opers/wallhops
%%INSTALL_PREFIX%%/lib/help/opers/wallvoices
%%INSTALL_PREFIX%%/lib/help/opers/whois
%%INSTALL_PREFIX%%/lib/help/opers/zline
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/channelmodes
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/gline
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/index
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/list
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/shun
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/stats
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/usermodes
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/who
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/zline
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/admin
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/away
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/challenge
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/invite
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/names
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/nick
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/version
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/ison
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/join
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/kick
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/motd
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/oper
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/part
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/quit
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/time
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/cnotice
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/cprivmsg
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/credits
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/copyright
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/info
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/ircops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/links
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/lusers
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/map
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/notice
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/pass
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/rules
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/silence
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/sethost
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/topic
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/userhost
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/userip
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/wallchops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/wallhops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/wallvoices
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/whois
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/users/commands
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/admin
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/away
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/challenge
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/channelmodes
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/check
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/clearmode
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/close
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/cnotice
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/commands
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/connect
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/copyright
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/cprivmsg
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/credits
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/die
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/dns
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/exempt
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/get
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/gline
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/globops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/hash
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/index
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/info
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/invite
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/ircops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/ison
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/join
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/kick
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/kill
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/links
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/list
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/lusers
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/map
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/mkpasswd
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/motd
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/names
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/nick
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/notice
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/oper
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/opermotd
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/opmode
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/part
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/pass
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/privs
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/quit
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/rehash
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/reset
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/restart
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/rules
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/set
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/sethost
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/settime
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/shun
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/silence
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/snomasks
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/squit
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/stats
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/time
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/topic
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/trace
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/uhelp
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/who
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/userhost
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/userip
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/usermodes
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/version
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/wallchops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/wallhops
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/wallvoices
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/whois
%%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/zline
@dirrm %%INSTALL_PREFIX%%/bin
@dirrm %%INSTALL_PREFIX%%/lib/help/opers
@dirrm %%INSTALL_PREFIX%%/lib/help/users
@dirrm %%INSTALL_PREFIX%%/lib/help
%%PORTDOCS%%@dirrm %%INSTALL_PREFIX%%/lib/help/opers
%%PORTDOCS%%@dirrm %%INSTALL_PREFIX%%/lib/help/users
%%PORTDOCS%%@dirrm %%INSTALL_PREFIX%%/lib/help
@dirrm %%INSTALL_PREFIX%%/lib
@dirrm %%INSTALL_PREFIX%%