aboutsummaryrefslogtreecommitdiff
path: root/x11/gnomeapplets2
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-08-27 22:14:13 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-08-27 22:14:13 +0000
commitf2dfb0554f059ea0ad8bd08b26ae6820950ddaa4 (patch)
tree350cf9d0848cb785e2122c74e665b6404a08f16b /x11/gnomeapplets2
parent50141885e482c528408a6a790e2f918528af9e99 (diff)
downloadports-f2dfb0554f059ea0ad8bd08b26ae6820950ddaa4.tar.gz
ports-f2dfb0554f059ea0ad8bd08b26ae6820950ddaa4.zip
Notes
Diffstat (limited to 'x11/gnomeapplets2')
-rw-r--r--x11/gnomeapplets2/Makefile17
-rw-r--r--x11/gnomeapplets2/distinfo2
-rw-r--r--x11/gnomeapplets2/files/patch-aa21
-rw-r--r--x11/gnomeapplets2/pkg-plist1
4 files changed, 17 insertions, 24 deletions
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index a267209cee0d..9a210a6707d9 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTVERSION= 2.0.2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/gnome-applets
+MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-applets
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -24,9 +23,9 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomeprefix gnomehack
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -39,14 +38,8 @@ PLIST_SUB= BATTERY="@comment "
PLIST_SUB= BATTERY=""
.endif
-pre-patch:
+post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
- 's|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
- s|[(]datadir[)]/gnome/|(datadir)/|g ; \
- s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
- s|[(]prefix[)]/lib/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
- s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
.include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 6bfbfbd2cfe2..f88255320799 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.1.tar.bz2) = 40b9c65619467d364cb3e54086151ee0
+MD5 (gnome2/gnome-applets-2.0.2.tar.bz2) = 2b050aa1d3fd0da62be5999fefb4b18c
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 2ade32e6eba6..168141cd62db 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon May 20 17:48:43 2002
-+++ configure Thu May 30 10:42:05 2002
-@@ -6966,6 +6966,7 @@
+--- configure.orig Tue Aug 27 14:17:28 2002
++++ configure Tue Aug 27 14:20:19 2002
+@@ -6994,6 +6994,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,29 +8,28 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10556,6 +10557,7 @@
+@@ -10765,6 +10766,7 @@
*irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
*linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
+*freebsd*) CDROM_HOST=freebsd;cd_device_path="dev/acd0c";;
- *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";;
+ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
esac
case "$host" in
-@@ -10600,6 +10602,21 @@
+@@ -10817,6 +10819,20 @@
HAVE_LIBAPM_TRUE='#'
HAVE_LIBAPM_FALSE=
fi
-+
+ ;;
+ i386-*-freebsd*)
+ HAVE_LIBAPM=no
+
+if test "x$HAVE_LIBAPM" = "xyes"; then
-+ HAVE_LIBAPM_TRUE=
-+ HAVE_LIBAPM_FALSE='#'
++ HAVE_LIBAPM_TRUE=
++ HAVE_LIBAPM_FALSE='#'
+else
-+ HAVE_LIBAPM_TRUE='#'
-+ HAVE_LIBAPM_FALSE=
++ HAVE_LIBAPM_TRUE='#'
++ HAVE_LIBAPM_FALSE=
+fi
+ ;;
+ *-*-freebsd*)
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 13c7061ea95c..fa4427fdccd1 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -433,6 +433,7 @@ share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo