aboutsummaryrefslogtreecommitdiffstats
path: root/irc
diff options
context:
space:
mode:
authorreg <reg@FreeBSD.org>2000-10-05 14:23:01 +0800
committerreg <reg@FreeBSD.org>2000-10-05 14:23:01 +0800
commit38d35e3db9111f42b79313f05731c75e6e55d7e8 (patch)
tree15816ec7b527e5501d5e562ef34c25d7d1093d4a /irc
parente57ab899e8ccc8394fbdc7a53114f2d7e4b9a8d8 (diff)
downloadfreebsd-ports-gnome-38d35e3db9111f42b79313f05731c75e6e55d7e8.tar.gz
freebsd-ports-gnome-38d35e3db9111f42b79313f05731c75e6e55d7e8.tar.zst
freebsd-ports-gnome-38d35e3db9111f42b79313f05731c75e6e55d7e8.zip
Implement USE_GLIB.
Diffstat (limited to 'irc')
-rw-r--r--irc/irssi-devel/Makefile18
-rw-r--r--irc/irssi-devel/files/patch-ad9
-rw-r--r--irc/irssi-devel/files/patch-ag11
-rw-r--r--irc/irssi-devel/pkg-plist13
-rw-r--r--irc/irssi/Makefile18
-rw-r--r--irc/irssi/files/patch-ad9
-rw-r--r--irc/irssi/files/patch-ag11
-rw-r--r--irc/irssi/pkg-plist13
8 files changed, 68 insertions, 34 deletions
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 950bc1c224b1..ef354c958215 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -13,19 +13,19 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-3
MAINTAINER= jim@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
-
CONFIGURE_ARGS= --without-socks --with-textui --with-bot \
--without-servertest
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -lintl"
.include <bsd.port.pre.mk>
@@ -35,8 +35,10 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --disable-ipv6
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/irc/irssi-devel/files/patch-ad b/irc/irssi-devel/files/patch-ad
index b097283d3244..ac93ec27b945 100644
--- a/irc/irssi-devel/files/patch-ad
+++ b/irc/irssi-devel/files/patch-ad
@@ -1,14 +1,5 @@
--- configure.orig Sun Jun 4 10:48:10 2000
+++ configure Fri Jun 9 18:03:22 2000
-@@ -4831,7 +4831,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5546,6 +5546,7 @@
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
diff --git a/irc/irssi-devel/files/patch-ag b/irc/irssi-devel/files/patch-ag
new file mode 100644
index 000000000000..33ac9df8cfcc
--- /dev/null
+++ b/irc/irssi-devel/files/patch-ag
@@ -0,0 +1,11 @@
+--- src/perl/irssi-perl.c.orig Sat Sep 9 01:48:00 2000
++++ src/perl/irssi-perl.c Sat Sep 9 01:47:49 2000
+@@ -18,6 +18,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#define PERL_POLLUTE
++
+ #include <EXTERN.h>
+ #ifndef _SEM_SEMUN_UNDEFINED
+ #define HAS_UNION_SEMUN
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 28466ffeccc0..0c479166b741 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,8 +1,18 @@
bin/botti
bin/irssi
+doc/irssi/botnet.txt
+doc/irssi/design.txt
+doc/irssi/formats.txt
+doc/irssi/manual.txt
+doc/irssi/perl.txt
+doc/irssi/signals.txt
+doc/irssi/special_vars.txt
etc/irssi/colorless.theme
etc/irssi/config
etc/irssi/split.theme
+i386-freebsd/auto/Irssi/.packlist
+i386-freebsd/auto/Irssi/Irssi.bs
+i386-freebsd/auto/Irssi/Irssi.so
lib/irssi/plugins/libfe_common_irc_dcc.a
lib/irssi/plugins/libfe_common_irc_dcc.so
lib/irssi/plugins/libfe_common_irc_dcc.so.0
@@ -137,4 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/irssi.mo
@dirrm share/irssi
@dirrm lib/irssi/plugins
@dirrm lib/irssi
+@dirrm i386-freebsd/auto/Irssi
@dirrm etc/irssi
+@dirrm doc/irssi
+@dirrm doc
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 950bc1c224b1..ef354c958215 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -13,19 +13,19 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-3
MAINTAINER= jim@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
-
CONFIGURE_ARGS= --without-socks --with-textui --with-bot \
--without-servertest
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -lintl"
.include <bsd.port.pre.mk>
@@ -35,8 +35,10 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --disable-ipv6
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/irc/irssi/files/patch-ad b/irc/irssi/files/patch-ad
index b097283d3244..ac93ec27b945 100644
--- a/irc/irssi/files/patch-ad
+++ b/irc/irssi/files/patch-ad
@@ -1,14 +1,5 @@
--- configure.orig Sun Jun 4 10:48:10 2000
+++ configure Fri Jun 9 18:03:22 2000
-@@ -4831,7 +4831,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5546,6 +5546,7 @@
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
diff --git a/irc/irssi/files/patch-ag b/irc/irssi/files/patch-ag
new file mode 100644
index 000000000000..33ac9df8cfcc
--- /dev/null
+++ b/irc/irssi/files/patch-ag
@@ -0,0 +1,11 @@
+--- src/perl/irssi-perl.c.orig Sat Sep 9 01:48:00 2000
++++ src/perl/irssi-perl.c Sat Sep 9 01:47:49 2000
+@@ -18,6 +18,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#define PERL_POLLUTE
++
+ #include <EXTERN.h>
+ #ifndef _SEM_SEMUN_UNDEFINED
+ #define HAS_UNION_SEMUN
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 28466ffeccc0..0c479166b741 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,8 +1,18 @@
bin/botti
bin/irssi
+doc/irssi/botnet.txt
+doc/irssi/design.txt
+doc/irssi/formats.txt
+doc/irssi/manual.txt
+doc/irssi/perl.txt
+doc/irssi/signals.txt
+doc/irssi/special_vars.txt
etc/irssi/colorless.theme
etc/irssi/config
etc/irssi/split.theme
+i386-freebsd/auto/Irssi/.packlist
+i386-freebsd/auto/Irssi/Irssi.bs
+i386-freebsd/auto/Irssi/Irssi.so
lib/irssi/plugins/libfe_common_irc_dcc.a
lib/irssi/plugins/libfe_common_irc_dcc.so
lib/irssi/plugins/libfe_common_irc_dcc.so.0
@@ -137,4 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/irssi.mo
@dirrm share/irssi
@dirrm lib/irssi/plugins
@dirrm lib/irssi
+@dirrm i386-freebsd/auto/Irssi
@dirrm etc/irssi
+@dirrm doc/irssi
+@dirrm doc