diff options
| author | arved <arved@FreeBSD.org> | 2007-03-24 21:39:18 +0800 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2007-03-24 21:39:18 +0800 |
| commit | 42eaceaef90b820bb1230afaf146a6d59e6c6bb8 (patch) | |
| tree | 2ba0fc255e21c90bcb57500200c1417bdbb2f061 | |
| parent | b917bd525c2e04bf70c21d51cc4bd9ae02bb69bb (diff) | |
| download | freebsd-ports-gnome-42eaceaef90b820bb1230afaf146a6d59e6c6bb8.tar.gz freebsd-ports-gnome-42eaceaef90b820bb1230afaf146a6d59e6c6bb8.tar.zst freebsd-ports-gnome-42eaceaef90b820bb1230afaf146a6d59e6c6bb8.zip | |
Mark IGNORE on amd64 5.x and use machine/speaker.h on 5.x,
dev/speaker/speaker.h was not MFCt to 5.x
| -rw-r--r-- | sysutils/wmhm/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/wmhm/files/patch-ac | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile index df3f9e7189d2..56b91bc7afab 100644 --- a/sysutils/wmhm/Makefile +++ b/sysutils/wmhm/Makefile @@ -30,6 +30,10 @@ CONFIGURE_ARGS+=--with-xpm-includes=${X11BASE}/include \ .include <bsd.port.pre.mk> +.if (${OSVERSION} < 601000) && (${ARCH} == "amd64") +IGNORE= 5.x does not support speaker(4) +.endif + post-install: ${STRIP_CMD} ${PREFIX}/bin/wmhm diff --git a/sysutils/wmhm/files/patch-ac b/sysutils/wmhm/files/patch-ac index 44a782adaacd..c7f2b816ee52 100644 --- a/sysutils/wmhm/files/patch-ac +++ b/sysutils/wmhm/files/patch-ac @@ -1,11 +1,15 @@ --- operations.c.orig Sun Jul 22 07:00:55 2001 -+++ operations.c Sat Mar 17 17:43:22 2007 -@@ -39,12 +39,11 @@ ++++ operations.c Sat Mar 24 14:29:26 2007 +@@ -39,12 +39,16 @@ #include <unistd.h> #include <math.h> #include <machine/cpufunc.h> --#include <machine/speaker.h> ++#include <osreldate.h> ++#if __FreeBSD_version >= 601000 +#include <dev/speaker/speaker.h> ++#else + #include <machine/speaker.h> ++#endif #ifdef HAVE_SMBUS -#include <machine/smb.h> |