diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index 850647e69c29..60ee1948bbca 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -7,20 +7,18 @@ PORTNAME= irssi PORTVERSION= 0.7.98.3 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://irssi.org/files/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext - USE_BZIP2= yes USE_PERL5= yes USE_GLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-socks --with-bot --without-servertest \ --enable-perl-path=${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} - CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" .include diff --git a/irc/irssi-devel/files/patch-src_perl_Makefile.in b/irc/irssi-devel/files/patch-src_perl_Makefile.in new file mode 100644 index 000000000000..1d45946c5098 --- /dev/null +++ b/irc/irssi-devel/files/patch-src_perl_Makefile.in @@ -0,0 +1,11 @@ +--- src/perl/Makefile.in.orig Thu Apr 26 10:31:06 2001 ++++ src/perl/Makefile.in Thu Apr 26 10:32:04 2001 +@@ -473,7 +473,7 @@ + cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals-list.h + + all-local: +- for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL LIB=$(PERL_LIB_DIR) PREFIX=$(PERL_LIB_DIR); fi; fi && ($(MAKE) || $(MAKE)) && cd ..; done ++ for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL ; fi; fi && ($(MAKE) || $(MAKE)) && cd ..; done + + install-exec-local: + for dir in common irc; do cd $$dir && $(MAKE) install && cd ..; done diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist index 74b201c3dca5..e1f852e9bd5a 100644 --- a/irc/irssi-devel/pkg-plist +++ b/irc/irssi-devel/pkg-plist @@ -13,15 +13,14 @@ etc/irssi/config.sample etc/irssi/default.theme etc/irssi/colorless.theme etc/irssi/config -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irssi.so -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irssi.bs -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/.packlist -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/Irc.so -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/Irc.bs -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/.packlist -lib/perl5/site_perl/5.005/i386-freebsd/Irssi.pm -lib/perl5/site_perl/5.005/i386-freebsd/perllocal.pod -lib/perl5/site_perl/5.005/i386-freebsd/Irssi/Irc.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/Irc.pm lib/irssi/modules/libfe_irc_dcc.a lib/irssi/modules/libfe_irc_dcc.la lib/irssi/modules/libfe_irc_dcc.so @@ -165,9 +164,9 @@ share/irssi/help/wjoin share/irssi/help/wquery @dirrm share/doc/irssi @dirrm etc/irssi -@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc -@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi -@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Irssi +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi @dirrm lib/irssi/modules @dirrm lib/irssi @dirrm share/irssi/help diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 850647e69c29..60ee1948bbca 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -7,20 +7,18 @@ PORTNAME= irssi PORTVERSION= 0.7.98.3 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://irssi.org/files/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext - USE_BZIP2= yes USE_PERL5= yes USE_GLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-socks --with-bot --without-servertest \ --enable-perl-path=${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} - CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" .include diff --git a/irc/irssi/files/patch-src_perl_Makefile.in b/irc/irssi/files/patch-src_perl_Makefile.in new file mode 100644 index 000000000000..1d45946c5098 --- /dev/null +++ b/irc/irssi/files/patch-src_perl_Makefile.in @@ -0,0 +1,11 @@ +--- src/perl/Makefile.in.orig Thu Apr 26 10:31:06 2001 ++++ src/perl/Makefile.in Thu Apr 26 10:32:04 2001 +@@ -473,7 +473,7 @@ + cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals-list.h + + all-local: +- for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL LIB=$(PERL_LIB_DIR) PREFIX=$(PERL_LIB_DIR); fi; fi && ($(MAKE) || $(MAKE)) && cd ..; done ++ for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL ; fi; fi && ($(MAKE) || $(MAKE)) && cd ..; done + + install-exec-local: + for dir in common irc; do cd $$dir && $(MAKE) install && cd ..; done diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist index 74b201c3dca5..e1f852e9bd5a 100644 --- a/irc/irssi/pkg-plist +++ b/irc/irssi/pkg-plist @@ -13,15 +13,14 @@ etc/irssi/config.sample etc/irssi/default.theme etc/irssi/colorless.theme etc/irssi/config -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irssi.so -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irssi.bs -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/.packlist -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/Irc.so -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/Irc.bs -lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/.packlist -lib/perl5/site_perl/5.005/i386-freebsd/Irssi.pm -lib/perl5/site_perl/5.005/i386-freebsd/perllocal.pod -lib/perl5/site_perl/5.005/i386-freebsd/Irssi/Irc.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/Irc.pm lib/irssi/modules/libfe_irc_dcc.a lib/irssi/modules/libfe_irc_dcc.la lib/irssi/modules/libfe_irc_dcc.so @@ -165,9 +164,9 @@ share/irssi/help/wjoin share/irssi/help/wquery @dirrm share/doc/irssi @dirrm etc/irssi -@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc -@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi -@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Irssi +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi @dirrm lib/irssi/modules @dirrm lib/irssi @dirrm share/irssi/help