aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-09-03 01:13:36 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-09-03 01:13:36 +0000
commitaf9d08185d339200d25b3d4336e1f7b94149cabc (patch)
tree1efffd6ac89d92737c373d250d66897894d0191d
parent4434c0d0e910a78f619e5edf9854a7ad0b76fa7d (diff)
downloadports-af9d08185d339200d25b3d4336e1f7b94149cabc.tar.gz
ports-af9d08185d339200d25b3d4336e1f7b94149cabc.zip
Notes
-rw-r--r--net-im/gaim/Makefile17
-rw-r--r--net-im/gaim/distinfo2
-rw-r--r--net-im/gaim/files/patch-configure11
-rw-r--r--net-im/gaim/pkg-plist10
-rw-r--r--net/gaim/Makefile17
-rw-r--r--net/gaim/distinfo2
-rw-r--r--net/gaim/files/patch-configure11
-rw-r--r--net/gaim/pkg-plist10
8 files changed, 68 insertions, 12 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index bebbfe8ea3bc..cd6e4c396fb4 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,8 +5,7 @@
#
PORTNAME= gaim
-PORTVERSION= 0.67
-PORTREVISION= 1
+PORTVERSION= 0.68
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,6 +18,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
USE_PERL5= yes
+USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static=yes
@@ -27,6 +27,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAN1= gaim.1 gaim-remote.1
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+CONFIGURE_ARGS+= --disable-perl
+PLIST_SUB+= PERL:="@comment "
+.else
+PLIST_SUB+= PERL:=""
+.endif
+
.ifndef(WITHOUT_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2
.else
@@ -50,5 +59,7 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 13b689d8819c..217a977558e2 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.67.tar.gz) = c3e1092f552881a5eb451afdb9c249af
+MD5 (gaim-0.68.tar.bz2) = 604c749f236e3813a1d2341e2e9208bc
diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure
new file mode 100644
index 000000000000..24c798ab7451
--- /dev/null
+++ b/net-im/gaim/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Tue Sep 2 20:51:30 2003
++++ configure Tue Sep 2 20:51:41 2003
+@@ -15914,7 +15914,7 @@
+ fi
+
+ prefix=`eval echo $prefix`
+- PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=$prefix"
++ PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=%%LOCALBASE%%"
+
+
+ # Check whether --with-perl-lib or --without-perl-lib was given.
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index c466e27fdcee..cf87cc51bcca 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -19,7 +19,7 @@ lib/gaim/libtoc.so
lib/gaim/libyahoo.so
lib/gaim/libzephyr.so
lib/gaim/notify.so
-lib/gaim/perl.so
+%%PERL:%%lib/gaim/perl.so
lib/gaim/spellchk.so
lib/gaim/statenotify.so
lib/gaim/ticker.so
@@ -233,7 +233,6 @@ share/locale/ca/LC_MESSAGES/gaim.mo
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
share/locale/de/LC_MESSAGES/gaim.mo
-share/locale/en_GB/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/fi/LC_MESSAGES/gaim.mo
share/locale/fr/LC_MESSAGES/gaim.mo
@@ -266,3 +265,10 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
@dirrm share/gnome/pixmaps/gaim/buttons
@dirrm share/gnome/pixmaps/gaim
@dirrm lib/gaim
+@cwd %%LOCALBASE%%
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Gaim.pm
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/.packlist
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
+%%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index bebbfe8ea3bc..cd6e4c396fb4 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -5,8 +5,7 @@
#
PORTNAME= gaim
-PORTVERSION= 0.67
-PORTREVISION= 1
+PORTVERSION= 0.68
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,6 +18,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
USE_PERL5= yes
+USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static=yes
@@ -27,6 +27,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAN1= gaim.1 gaim-remote.1
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+CONFIGURE_ARGS+= --disable-perl
+PLIST_SUB+= PERL:="@comment "
+.else
+PLIST_SUB+= PERL:=""
+.endif
+
.ifndef(WITHOUT_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2
.else
@@ -50,5 +59,7 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 13b689d8819c..217a977558e2 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.67.tar.gz) = c3e1092f552881a5eb451afdb9c249af
+MD5 (gaim-0.68.tar.bz2) = 604c749f236e3813a1d2341e2e9208bc
diff --git a/net/gaim/files/patch-configure b/net/gaim/files/patch-configure
new file mode 100644
index 000000000000..24c798ab7451
--- /dev/null
+++ b/net/gaim/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Tue Sep 2 20:51:30 2003
++++ configure Tue Sep 2 20:51:41 2003
+@@ -15914,7 +15914,7 @@
+ fi
+
+ prefix=`eval echo $prefix`
+- PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=$prefix"
++ PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=%%LOCALBASE%%"
+
+
+ # Check whether --with-perl-lib or --without-perl-lib was given.
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index c466e27fdcee..cf87cc51bcca 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -19,7 +19,7 @@ lib/gaim/libtoc.so
lib/gaim/libyahoo.so
lib/gaim/libzephyr.so
lib/gaim/notify.so
-lib/gaim/perl.so
+%%PERL:%%lib/gaim/perl.so
lib/gaim/spellchk.so
lib/gaim/statenotify.so
lib/gaim/ticker.so
@@ -233,7 +233,6 @@ share/locale/ca/LC_MESSAGES/gaim.mo
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
share/locale/de/LC_MESSAGES/gaim.mo
-share/locale/en_GB/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/fi/LC_MESSAGES/gaim.mo
share/locale/fr/LC_MESSAGES/gaim.mo
@@ -266,3 +265,10 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
@dirrm share/gnome/pixmaps/gaim/buttons
@dirrm share/gnome/pixmaps/gaim
@dirrm lib/gaim
+@cwd %%LOCALBASE%%
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Gaim.pm
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/.packlist
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
+%%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3