diff options
| author | feld <feld@FreeBSD.org> | 2017-01-07 02:23:38 +0800 |
|---|---|---|
| committer | feld <feld@FreeBSD.org> | 2017-01-07 02:23:38 +0800 |
| commit | 3c169369fd842e49a211498c0678fccf2c938291 (patch) | |
| tree | 2ef937ce2504d153593b2b9621c898f773904bb5 /net-mgmt | |
| parent | 674784e320d32052b1576df7d7ff6f0db263f39a (diff) | |
| download | freebsd-ports-gnome-3c169369fd842e49a211498c0678fccf2c938291.tar.gz freebsd-ports-gnome-3c169369fd842e49a211498c0678fccf2c938291.tar.zst freebsd-ports-gnome-3c169369fd842e49a211498c0678fccf2c938291.zip | |
net-mgmt/rancid3: Port cleanup
Fix some variables in post-install, make Comware support include a
version number that matches PORTVERSION
PR: 215832
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/rancid3/Makefile | 12 | ||||
| -rw-r--r-- | net-mgmt/rancid3/files/cmw.pm.in (renamed from net-mgmt/rancid3/files/cmw.pm) | 0 | ||||
| -rw-r--r-- | net-mgmt/rancid3/files/cmwlogin.in (renamed from net-mgmt/rancid3/files/cmwlogin) | 0 |
3 files changed, 7 insertions, 5 deletions
diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile index 518be2181852..2720f5a4fc8d 100644 --- a/net-mgmt/rancid3/Makefile +++ b/net-mgmt/rancid3/Makefile @@ -3,7 +3,7 @@ PORTNAME= rancid PORTVERSION= 3.6.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 @@ -30,8 +30,8 @@ CONFIGURE_ARGS= --localstatedir=${LOCALBASE}/var/${PORTNAME}/ \ OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE2= util/lg/lg.conf -NEWERCONFIG_FILES1= etc/rancid.conf -NEWERCONFIG_FILES2= etc/lg.conf +NEWERCONFIG_FILE1= etc/rancid.conf +NEWERCONFIG_FILE2= etc/lg.conf NEWCONFIG_FILES= rancid.conf lg.conf OPTIONS_DEFINE= COMWARE SVN @@ -64,6 +64,8 @@ pre-everything:: post-patch: .if ${PORT_OPTIONS:MCOMWARE} ${CAT} ${FILESDIR}/comware_types.conf >> ${WRKSRC}/etc/rancid.types.base + ${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmwlogin.in > ${WRKDIR}/cmwlogin + ${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmw.pm.in > ${WRKDIR}/cmw.pm .endif ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 @@ -74,8 +76,8 @@ post-install: ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${LOCALBASE}/bin ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${LOCALBASE}/bin .if ${PORT_OPTIONS:MCOMWARE} - ${INSTALL_DATA} ${FILESDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid - ${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid + ${INSTALL_DATA} ${WRKDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid + ${INSTALL_SCRIPT} ${WRKDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid .endif .for file in ${NEWCONFIG_FILES} @ if [ -f ${LOCALBASE}/etc/${PORTNAME}/${file} ] ; then \ diff --git a/net-mgmt/rancid3/files/cmw.pm b/net-mgmt/rancid3/files/cmw.pm.in index fac13cb975ce..fac13cb975ce 100644 --- a/net-mgmt/rancid3/files/cmw.pm +++ b/net-mgmt/rancid3/files/cmw.pm.in diff --git a/net-mgmt/rancid3/files/cmwlogin b/net-mgmt/rancid3/files/cmwlogin.in index b54e9c54a5db..b54e9c54a5db 100644 --- a/net-mgmt/rancid3/files/cmwlogin +++ b/net-mgmt/rancid3/files/cmwlogin.in |