summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/gnome-applets/Makefile17
-rw-r--r--x11/gnome-applets/files/patch-aa16
-rw-r--r--x11/gnomeapplets2/Makefile17
-rw-r--r--x11/gnomeapplets2/files/patch-aa16
4 files changed, 52 insertions, 14 deletions
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 <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
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 <unistd.h>
#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 <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
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 <unistd.h>
#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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 01:48:47 +0800