Rev 1: use program prefix like other GNU packages

2 files changed, 121 insertions, 54 deletions

diff --git a/net/inetutils/Makefile b/net/inetutils/Makefile
index 4aeddf20601..c2ab2d802ec 100644
--- a/net/inetutils/Makefile
+++ b/net/inetutils/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/07/07 04:03:06 adam Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/08 09:43:02 adam Exp $
 
 DISTNAME=	inetutils-1.9.4
+PKGVERSION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=inetutils/}
 EXTRACT_SUFX=	.tar.xz
@@ -10,12 +11,25 @@ HOMEPAGE=	http://www.gnu.org/software/inetutils/
 COMMENT=	GNU network utilities
 LICENSE=	gnu-gpl-v3
 
+AUTO_MKDIRS=		yes
 INFO_FILES=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--program-prefix=g
 CONFIGURE_ARGS+=	--with-path-bshell=${SH:Q}
 CONFIGURE_ARGS+=	--with-path-cp=${CP:Q}
 
 TEST_TARGET=		check
 
+post-install:
+.for f in dnsdomainname ftp hostname ifconfig logger ping ping6 \
+	rcp rexec rlogin rsh talk telnet tftp traceroute whois
+	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
+.endfor
+.for f in ftpd inetd rexecd rlogind rshd syslogd talkd telnetd tftpd uucpd
+	${LN} -sf ${PREFIX}/libexec/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}libexec/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man8/g${f}.8 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man8/${f}.8
+.endfor
+
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/inetutils/PLIST b/net/inetutils/PLIST
index 96d39e8f82c..25e8b9c356c 100644
--- a/net/inetutils/PLIST
+++ b/net/inetutils/PLIST
@@ -1,54 +1,107 @@
-@comment $NetBSD: PLIST,v 1.1 2017/07/07 04:03:06 adam Exp $
-bin/dnsdomainname
-bin/ftp
-bin/hostname
-bin/ifconfig
-bin/logger
-bin/ping
-bin/ping6
-bin/rcp
-bin/rexec
-bin/rlogin
-bin/rsh
-bin/talk
-bin/telnet
-bin/tftp
-bin/traceroute
-bin/whois
+@comment $NetBSD: PLIST,v 1.2 2017/09/08 09:43:02 adam Exp $
+bin/gdnsdomainname
+bin/gftp
+bin/ghostname
+bin/gifconfig
+bin/glogger
+bin/gping
+bin/gping6
+bin/grcp
+bin/grexec
+bin/grlogin
+bin/grsh
+bin/gtalk
+bin/gtelnet
+bin/gtftp
+bin/gtraceroute
+bin/gwhois
+gnu/bin/dnsdomainname
+gnu/bin/ftp
+gnu/bin/hostname
+gnu/bin/ifconfig
+gnu/bin/logger
+gnu/bin/ping
+gnu/bin/ping6
+gnu/bin/rcp
+gnu/bin/rexec
+gnu/bin/rlogin
+gnu/bin/rsh
+gnu/bin/talk
+gnu/bin/telnet
+gnu/bin/tftp
+gnu/bin/traceroute
+gnu/bin/whois
+gnu/libexec/ftpd
+gnu/libexec/inetd
+gnu/libexec/rexecd
+gnu/libexec/rlogind
+gnu/libexec/rshd
+gnu/libexec/syslogd
+gnu/libexec/talkd
+gnu/libexec/telnetd
+gnu/libexec/tftpd
+gnu/libexec/uucpd
+man/man1/gdnsdomainname.1
+gnu/man/man1/dnsdomainname.1
+gnu/man/man1/ftp.1
+gnu/man/man1/hostname.1
+gnu/man/man1/ifconfig.1
+gnu/man/man1/logger.1
+gnu/man/man1/ping.1
+gnu/man/man1/ping6.1
+gnu/man/man1/rcp.1
+gnu/man/man1/rexec.1
+gnu/man/man1/rlogin.1
+gnu/man/man1/rsh.1
+gnu/man/man1/talk.1
+gnu/man/man1/telnet.1
+gnu/man/man1/tftp.1
+gnu/man/man1/traceroute.1
+gnu/man/man1/whois.1
+gnu/man/man8/ftpd.8
+gnu/man/man8/inetd.8
+gnu/man/man8/rexecd.8
+gnu/man/man8/rlogind.8
+gnu/man/man8/rshd.8
+gnu/man/man8/syslogd.8
+gnu/man/man8/talkd.8
+gnu/man/man8/telnetd.8
+gnu/man/man8/tftpd.8
+gnu/man/man8/uucpd.8
 info/inetutils.info
-libexec/ftpd
-libexec/inetd
-libexec/rexecd
-libexec/rlogind
-libexec/rshd
-libexec/syslogd
-libexec/talkd
-libexec/telnetd
-libexec/tftpd
-libexec/uucpd
-man/man1/dnsdomainname.1
-man/man1/ftp.1
-man/man1/hostname.1
-man/man1/ifconfig.1
-man/man1/logger.1
-man/man1/ping.1
-man/man1/ping6.1
-man/man1/rcp.1
-man/man1/rexec.1
-man/man1/rlogin.1
-man/man1/rsh.1
-man/man1/talk.1
-man/man1/telnet.1
-man/man1/tftp.1
-man/man1/traceroute.1
-man/man1/whois.1
-man/man8/ftpd.8
-man/man8/inetd.8
-man/man8/rexecd.8
-man/man8/rlogind.8
-man/man8/rshd.8
-man/man8/syslogd.8
-man/man8/talkd.8
-man/man8/telnetd.8
-man/man8/tftpd.8
-man/man8/uucpd.8
+libexec/gftpd
+libexec/ginetd
+libexec/grexecd
+libexec/grlogind
+libexec/grshd
+libexec/gsyslogd
+libexec/gtalkd
+libexec/gtelnetd
+libexec/gtftpd
+libexec/guucpd
+man/man1/gdnsdomainname.1
+man/man1/gftp.1
+man/man1/ghostname.1
+man/man1/gifconfig.1
+man/man1/glogger.1
+man/man1/gping.1
+man/man1/gping6.1
+man/man1/grcp.1
+man/man1/grexec.1
+man/man1/grlogin.1
+man/man1/grsh.1
+man/man1/gtalk.1
+man/man1/gtelnet.1
+man/man1/gtftp.1
+man/man1/gtraceroute.1
+man/man1/gwhois.1
+man/man8/gftpd.8
+man/man8/ginetd.8
+man/man8/grexecd.8
+man/man8/grlogind.8
+man/man8/grshd.8
+man/man8/gsyslogd.8
+man/man8/gtalkd.8
+man/man8/gtelnetd.8
+man/man8/gtftpd.8
+man/man8/guucpd.8