diff options
| author | jeh <jeh@FreeBSD.org> | 2004-02-07 13:57:56 +0000 |
|---|---|---|
| committer | jeh <jeh@FreeBSD.org> | 2004-02-07 13:57:56 +0000 |
| commit | f645a89131f574a557b9c5d0b37d4ea7fe938e2e (patch) | |
| tree | c51e279a9c738fc2d8aae3cdb28b1b7f1be4f569 /misc | |
| parent | addd1b55d9c8f25ee66001ecff03f32987a5d03d (diff) | |
| download | FreeBSD-ports-f645a89131f574a557b9c5d0b37d4ea7fe938e2e.zip FreeBSD-ports-f645a89131f574a557b9c5d0b37d4ea7fe938e2e.tar.gz | |
Fiddle with pkg-plist to make happy on 5.2 i386
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/amanda-server/Makefile | 8 | ||||
| -rw-r--r-- | misc/amanda25-server/Makefile | 8 | ||||
| -rw-r--r-- | misc/amanda26-server/Makefile | 8 | ||||
| -rw-r--r-- | misc/amanda32-server/Makefile | 8 |
4 files changed, 12 insertions, 20 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 9722db8..582777a 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.4 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,10 +29,6 @@ PATCH_STRIP= .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 -BROKEN= "Broken pkg-plist" -.endif - .if exists(/usr/include/sys/scsiio.h) .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif @@ -144,6 +140,8 @@ PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 .if ${MACHINE_ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' +.elif ${OSVERSION} >= 502000 && ${MACHINE_ARCH} == "i386" +PLIST_SUB+= SCSICHG='@comment ' .else PLIST_SUB+= SCSICHG='' .endif diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 9722db8..582777a 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.4 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,10 +29,6 @@ PATCH_STRIP= .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 -BROKEN= "Broken pkg-plist" -.endif - .if exists(/usr/include/sys/scsiio.h) .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif @@ -144,6 +140,8 @@ PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 .if ${MACHINE_ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' +.elif ${OSVERSION} >= 502000 && ${MACHINE_ARCH} == "i386" +PLIST_SUB+= SCSICHG='@comment ' .else PLIST_SUB+= SCSICHG='' .endif diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 9722db8..582777a 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.4 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,10 +29,6 @@ PATCH_STRIP= .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 -BROKEN= "Broken pkg-plist" -.endif - .if exists(/usr/include/sys/scsiio.h) .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif @@ -144,6 +140,8 @@ PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 .if ${MACHINE_ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' +.elif ${OSVERSION} >= 502000 && ${MACHINE_ARCH} == "i386" +PLIST_SUB+= SCSICHG='@comment ' .else PLIST_SUB+= SCSICHG='' .endif diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 9722db8..582777a 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.4 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,10 +29,6 @@ PATCH_STRIP= .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 -BROKEN= "Broken pkg-plist" -.endif - .if exists(/usr/include/sys/scsiio.h) .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif @@ -144,6 +140,8 @@ PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 .if ${MACHINE_ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' +.elif ${OSVERSION} >= 502000 && ${MACHINE_ARCH} == "i386" +PLIST_SUB+= SCSICHG='@comment ' .else PLIST_SUB+= SCSICHG='' .endif |
