diff options
| -rw-r--r-- | sysutils/atop/Makefile | 16 | ||||
| -rw-r--r-- | sysutils/atop/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/atop/files/atop.in | 2 | ||||
| -rw-r--r-- | sysutils/atop/pkg-plist | 7 |
4 files changed, 15 insertions, 14 deletions
diff --git a/sysutils/atop/Makefile b/sysutils/atop/Makefile index 2dc4dde14247..fb4e2bd4331a 100644 --- a/sysutils/atop/Makefile +++ b/sysutils/atop/Makefile @@ -6,9 +6,9 @@ # PORTNAME= atop -PORTVERSION= 1.26.b7 +PORTVERSION= 1.26.b8 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_BERLIOS} +MASTER_SITES= BERLIOS MASTER_SITE_SUBDIR=atop-freebsd DISTNAME= ${PORTNAME}-${PORTVERSION:C|b|fbsd.beta|} @@ -29,6 +29,12 @@ PLIST_SUB+= LOGDIR="${LOGDIR}" SUB_FILES= pkg-message SUB_LIST= LOGDIR="${LOGDIR}" +PORTDOCS= AUTHOR \ + ChangeLog \ + ChangeLog.FreeBSD \ + README \ + README.FreeBSD + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/atop ${PREFIX}/bin @${LN} -sf ${PREFIX}/bin/atop ${PREFIX}/bin/atopsar @@ -39,9 +45,9 @@ do-install: @${MKDIR} ${LOGDIR} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/AUTHOR ${WRKSRC}/ChangeLog \ - ${WRKSRC}/ChangeLog.FreeBSD ${WRKSRC}/README.FreeBSD \ - ${WRKSRC}/README ${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor .endif @${CAT} ${PKGMESSAGE} diff --git a/sysutils/atop/distinfo b/sysutils/atop/distinfo index 9f904ce8c486..7811b15fa76e 100644 --- a/sysutils/atop/distinfo +++ b/sysutils/atop/distinfo @@ -1,2 +1,2 @@ -SHA256 (atop-1.26.fbsd.beta7.tar.bz2) = f0719eb25733a849e495849ee44319b486bec0084d429371e0536c43eed8a3dd -SIZE (atop-1.26.fbsd.beta7.tar.bz2) = 132226 +SHA256 (atop-1.26.fbsd.beta8.tar.bz2) = e9c9668ca5f71324fe86fcf6409c5966128ff28db5c04dd43c3c0166be963ee9 +SIZE (atop-1.26.fbsd.beta8.tar.bz2) = 132336 diff --git a/sysutils/atop/files/atop.in b/sysutils/atop/files/atop.in index 9eb224b4997e..c51ed96c6dae 100644 --- a/sysutils/atop/files/atop.in +++ b/sysutils/atop/files/atop.in @@ -62,7 +62,7 @@ atop_rotate() echo "Rotating logfile (${name})." # write final sample and stop sig_stop=SIGUSR2 - /usr/bin/find $atop_logdir -name atop_???????? -mtime +${atop_keepdays} -exec rm {} \; + /usr/bin/find $atop_logdir/ -name atop_???????? -mtime +${atop_keepdays} -exec rm {} \; run_rc_command "restart" } diff --git a/sysutils/atop/pkg-plist b/sysutils/atop/pkg-plist index 146e3efd8c6f..c0a00088fab5 100644 --- a/sysutils/atop/pkg-plist +++ b/sysutils/atop/pkg-plist @@ -1,9 +1,4 @@ bin/atop bin/atopsar -%%PORTDOCS%%%%DOCSDIR%%/AUTHOR -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.FreeBSD -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@exec /bin/ln -sf %D/bin/atop %D/bin/atopsar @unexec rmdir %%LOGDIR%% 2> /dev/null || true |