diff options
| -rw-r--r-- | misc/amanda-server/Makefile | 19 | ||||
| -rw-r--r-- | misc/amanda-server/pkg-plist.client | 7 | ||||
| -rw-r--r-- | misc/amanda25-server/Makefile | 19 | ||||
| -rw-r--r-- | misc/amanda25-server/pkg-plist.client | 7 | ||||
| -rw-r--r-- | misc/amanda26-server/Makefile | 19 | ||||
| -rw-r--r-- | misc/amanda26-server/pkg-plist.client | 7 | ||||
| -rw-r--r-- | misc/amanda32-server/Makefile | 19 | ||||
| -rw-r--r-- | misc/amanda32-server/pkg-plist.client | 7 |
8 files changed, 68 insertions, 36 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 4f1c4680d7d..60147fec978 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.5 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -70,15 +70,18 @@ pre-fetch: USE_PERL5= yes -RUN_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -BUILD_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-client --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -131,7 +134,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' @@ -170,12 +173,16 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" +BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-server --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amanda.8 amrecover.8 amrestore.8 diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client index f121624417a..7c255576d59 100644 --- a/misc/amanda-server/pkg-plist.client +++ b/misc/amanda-server/pkg-plist.client @@ -1,3 +1,4 @@ +@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi lib/libamanda-2.4.5.so lib/libamanda.so lib/libamanda.la @@ -96,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@dirrm var/amanda/gnutar-lists -@dirrm var/amanda -@dirrm var +@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true +@unexec rmdir %D/var/amanda 2>/dev/null || true +@unexec rmdir %D/var 2>/dev/null || true @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 4f1c4680d7d..60147fec978 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.5 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -70,15 +70,18 @@ pre-fetch: USE_PERL5= yes -RUN_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -BUILD_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-client --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -131,7 +134,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' @@ -170,12 +173,16 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" +BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-server --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amanda.8 amrecover.8 amrestore.8 diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client index f121624417a..7c255576d59 100644 --- a/misc/amanda25-server/pkg-plist.client +++ b/misc/amanda25-server/pkg-plist.client @@ -1,3 +1,4 @@ +@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi lib/libamanda-2.4.5.so lib/libamanda.so lib/libamanda.la @@ -96,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@dirrm var/amanda/gnutar-lists -@dirrm var/amanda -@dirrm var +@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true +@unexec rmdir %D/var/amanda 2>/dev/null || true +@unexec rmdir %D/var 2>/dev/null || true @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 4f1c4680d7d..60147fec978 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.5 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -70,15 +70,18 @@ pre-fetch: USE_PERL5= yes -RUN_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -BUILD_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-client --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -131,7 +134,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' @@ -170,12 +173,16 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" +BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-server --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amanda.8 amrecover.8 amrestore.8 diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client index f121624417a..7c255576d59 100644 --- a/misc/amanda26-server/pkg-plist.client +++ b/misc/amanda26-server/pkg-plist.client @@ -1,3 +1,4 @@ +@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi lib/libamanda-2.4.5.so lib/libamanda.so lib/libamanda.la @@ -96,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@dirrm var/amanda/gnutar-lists -@dirrm var/amanda -@dirrm var +@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true +@unexec rmdir %D/var/amanda 2>/dev/null || true +@unexec rmdir %D/var 2>/dev/null || true @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 4f1c4680d7d..60147fec978 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.5 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -70,15 +70,18 @@ pre-fetch: USE_PERL5= yes -RUN_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -BUILD_DEPENDS= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-client --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -131,7 +134,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' @@ -170,12 +173,16 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" +BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ --without-server --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar MAN8= amanda.8 amrecover.8 amrestore.8 diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client index f121624417a..7c255576d59 100644 --- a/misc/amanda32-server/pkg-plist.client +++ b/misc/amanda32-server/pkg-plist.client @@ -1,3 +1,4 @@ +@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi lib/libamanda-2.4.5.so lib/libamanda.so lib/libamanda.la @@ -96,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@dirrm var/amanda/gnutar-lists -@dirrm var/amanda -@dirrm var +@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true +@unexec rmdir %D/var/amanda 2>/dev/null || true +@unexec rmdir %D/var 2>/dev/null || true @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda |