From ee0712e9515125f3c02b02e2cb00a44cc87df4b7 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 16 Oct 2004 19:52:29 +0000 Subject: Warn users that FreeBSD sys src is required to build gnomeapplets2 on i386 (due to the new ACPI support). Reminded by: pav Adapted from: devel/libpci git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2991 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-applets/Makefile | 17 ++++++++++++++++- x11/gnome-applets/files/patch-aa | 16 ++++++++++------ x11/gnomeapplets2/Makefile | 17 ++++++++++++++++- x11/gnomeapplets2/files/patch-aa | 16 ++++++++++------ 4 files changed, 52 insertions(+), 14 deletions(-) (limited to 'x11') diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 16a500fb8..4d86584d6 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -28,13 +28,16 @@ USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gnomepanel \ gstreamerplugins gail USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + FREEBSD_SYS=${FREEBSD_SYS} GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \ gswitchit.schemas gtik.schemas gweather.schemas \ mailcheck.schemas mini-commander.schemas mixer.schemas \ modemlights.schemas multiload.schemas stickynotes.schemas +FREEBSD_SYS?= /usr/src/sys + .include .if ${ARCH} != "i386" @@ -43,6 +46,18 @@ PLIST_SUB= BATTERY="@comment " .else GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} " W A R N I N G" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" + @${ECHO_MSG} "* sources installed. If your kernel sources *" + @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" + @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" + @${ECHO_MSG} "* correct path. *" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "" .endif .include diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 1b65f3358..0186faf0e 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Tue Oct 12 17:23:32 2004 -+++ configure Tue Oct 12 17:24:57 2004 +--- configure.orig Sat Oct 16 15:45:26 2004 ++++ configure Sat Oct 16 15:47:04 2004 @@ -463,7 +463,7 @@ # include #endif" @@ -25,17 +25,21 @@ build_battstat_applet=no if test x$disable_battstat = xno; then -@@ -24535,7 +24537,8 @@ +@@ -24535,7 +24537,12 @@ ;; # list of supported OS cores that do not use libapm - *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ ACPIINC="-I/usr/src/sys" ++ if [ -n "${FREEBSD_SYS}" ]; then ++ ACPIINC="-I${FREEBSD_SYS}" ++ else ++ ACPIINC="-I/usr/src/sys" ++ fi ;; *) echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -26615,14 +26618,14 @@ +@@ -26615,14 +26622,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF @@ -52,7 +56,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -@@ -27773,6 +27776,7 @@ +@@ -27773,6 +27780,7 @@ s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t s,@CDROM_HOST@,$CDROM_HOST,;t t s,@CDROM_LIBS@,$CDROM_LIBS,;t t diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 16a500fb8..4d86584d6 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -28,13 +28,16 @@ USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gnomepanel \ gstreamerplugins gail USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + FREEBSD_SYS=${FREEBSD_SYS} GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \ gswitchit.schemas gtik.schemas gweather.schemas \ mailcheck.schemas mini-commander.schemas mixer.schemas \ modemlights.schemas multiload.schemas stickynotes.schemas +FREEBSD_SYS?= /usr/src/sys + .include .if ${ARCH} != "i386" @@ -43,6 +46,18 @@ PLIST_SUB= BATTERY="@comment " .else GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} " W A R N I N G" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" + @${ECHO_MSG} "* sources installed. If your kernel sources *" + @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" + @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" + @${ECHO_MSG} "* correct path. *" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "" .endif .include diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 1b65f3358..0186faf0e 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Tue Oct 12 17:23:32 2004 -+++ configure Tue Oct 12 17:24:57 2004 +--- configure.orig Sat Oct 16 15:45:26 2004 ++++ configure Sat Oct 16 15:47:04 2004 @@ -463,7 +463,7 @@ # include #endif" @@ -25,17 +25,21 @@ build_battstat_applet=no if test x$disable_battstat = xno; then -@@ -24535,7 +24537,8 @@ +@@ -24535,7 +24537,12 @@ ;; # list of supported OS cores that do not use libapm - *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ ACPIINC="-I/usr/src/sys" ++ if [ -n "${FREEBSD_SYS}" ]; then ++ ACPIINC="-I${FREEBSD_SYS}" ++ else ++ ACPIINC="-I/usr/src/sys" ++ fi ;; *) echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -26615,14 +26618,14 @@ +@@ -26615,14 +26622,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF @@ -52,7 +56,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -@@ -27773,6 +27776,7 @@ +@@ -27773,6 +27780,7 @@ s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t s,@CDROM_HOST@,$CDROM_HOST,;t t s,@CDROM_LIBS@,$CDROM_LIBS,;t t -- cgit v1.2.3