3 files changed, 270 insertions, 4 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index a78d021bc903..6394e064cbdd 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	irssi
 PORTVERSION=	0.8.19
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	irc
 MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
 
@@ -54,5 +54,9 @@ post-configure:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so
 
 .include <bsd.port.mk>
diff --git a/irc/irssi/files/patch-configure b/irc/irssi/files/patch-configure
index f7817b5cd434..d244d1b53e4b 100644
--- a/irc/irssi/files/patch-configure
+++ b/irc/irssi/files/patch-configure
@@ -1,6 +1,64 @@
---- configure.orig	2016-03-22 23:25:26 UTC
-+++ configure
-@@ -13849,12 +13849,12 @@ if test "${with_ncurses+set}" = set; the
+--- configure.orig	2016-03-23 07:25:26.000000000 +0800
++++ configure	2016-05-18 14:02:01.998133000 +0800
+@@ -652,6 +652,7 @@ BUILD_TEXTUI_FALSE
+ BUILD_TEXTUI_TRUE
+ PERL_STATIC_LIBS
+ PERL_MM_PARAMS
++PERL_MM_OPT
+ PERL_USE_LIB
+ PERL_CFLAGS
+ PERL_LDFLAGS
+@@ -1502,7 +1503,7 @@ Optional Packages:
+   --with-modules          Specify what modules to build in binary
+   --with-perl-staticlib   Specify that we want to link perl libraries
+                           statically in irssi, default is no
+-  --with-perl-lib=site|vendor|DIR  Specify where to install the
++  --with-perl-lib=perl|site|vendor|DIR  Specify where to install the
+                           Perl libraries for irssi, default is site
+   --with-perl=yes|no|module  Build with Perl support - also specifies
+                           if it should be built into main irssi binary
+@@ -12715,7 +12716,6 @@ fi
+ if test "x$prefix" != "xNONE"; then
+ 	prefix=`eval echo $prefix`
+ 	PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix"
+-	perl_library_dir="PERL_USE_LIB"
+ 	perl_set_use_lib=yes
+ 
+ 	perl_prefix_note=yes
+@@ -12742,24 +12742,29 @@ if test "${with_perl_lib+set}" = set; th
+ 		want_perl=yes
+ 	elif test "x$withval" = xno; then
+ 		want_perl=no
++	elif test "x$withval" = xperl; then
++		want_perl=yes
++		perl_prefix_note=no
++		PERL_MM_PARAMS="INSTALLDIRS=perl"
++		perl_set_use_lib=no
+ 	elif test "x$withval" = xsite; then
+ 		want_perl=yes
+ 		perl_prefix_note=no
+ 		PERL_MM_PARAMS=""
++		perl_set_use_lib=no
+ 	elif test "x$withval" = xvendor; then
+ 		want_perl=yes
+ 		perl_prefix_note=no
+ 		if test -z "`$perlpath -v|grep '5\.0'`"; then
+ 			PERL_MM_PARAMS="INSTALLDIRS=vendor"
+ 		else
+-			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`perl -e 'use Config; print $Config{prefix}'`"
++			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
+ 		fi
+-		perl_library_dir="(vendor default - `$perlpath -e 'use Config; print $Config{archlib}'`)"
++		perl_set_use_lib=no
+ 	else
+ 		want_perl=yes
+ 		perl_prefix_note=no
+ 		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
+-		perl_library_dir="PERL_USE_LIB"
+ 		perl_set_use_lib=yes
+ 	fi
+ else
+@@ -13849,12 +13854,12 @@ if test "${with_ncurses+set}" = set; the
  
      if $search_ncurses
      then
@@ -17,3 +75,84 @@
  	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
  $as_echo_n "checking for initscr in -lncurses... " >&6; }
  if ${ac_cv_lib_ncurses_initscr+:} false; then :
+@@ -14921,7 +14926,7 @@ $as_echo_n "checking for working Perl su
+ 	fi
+ 
+ 	if test "x$ac_cv_c_compiler_gnu" = "xyes" -a -z "`echo $host_os|grep 'bsd\|linux'`"; then
+-														PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-^DUIfm^ +/\1/g; s/^(.* )?\+^ +/\1/g'`
++														PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-[^DUIfm][^ ]+/\1/g; s/^(.* )?\+[^ ]+/\1/g'`
+ 
+ 		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
+ 
+@@ -15000,13 +15005,37 @@ $as_echo "ok" >&6; }
+ 			PERL_STATIC_LIBS=0
+ 		fi
+ 
++		# remove any prefix from PERL_MM_OPT
++		PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /[\s"]/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"`
++		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
++		echo 'show-INSTALLDIRS:' >> Makefile.test
++		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
++		perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS`
++		if test "x$perl_INSTALLDIRS" = "xsite"; then
++			perl_library_dir="site default"
++			perl_INSTALL_VAR=INSTALLSITEARCH
++		elif test "x$perl_INSTALLDIRS" = "xvendor"; then
++			perl_library_dir="vendor default"
++			perl_INSTALL_VAR=INSTALLVENDORARCH
++		else
++			perl_library_dir="module default"
++			perl_INSTALL_VAR=INSTALLARCHLIB
++		fi
++		echo 'show-ARCHLIB:' >> Makefile.test
++		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
++		perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB`
++		rm -f Makefile.test
+ 		# figure out the correct @INC path - we'll need to do this
+ 		# through MakeMaker since it's difficult to get it right
+ 		# otherwise.
+ 		if test "x$perl_set_use_lib" = "xyes"; then
+-			perl -e 'use ExtUtils::MakeMaker; WriteMakefile("NAME" => "test", "MAKEFILE" => "Makefile.test");' $PERL_MM_PARAMS >/dev/null
+-			PERL_USE_LIB=`perl -e 'open(F, "Makefile.test"); while (<F>) { chomp; if (/^(\w+) = (.*$)/) { $keys{$1} = $2; } }; $key = $keys{INSTALLARCHLIB}; while ($key =~ /\\$\((\w+)\)/) { $value = $keys{$1}; $key =~ s/\\$\($1\)/$value/; }; print $key;'`
+-			rm -f Makefile.test
++			if $perlpath -e 'exit ! grep $_ eq $ARGV[0], grep /^\//, @INC' "$perl_use_lib"; then
++				perl_library_dir="other path in @INC"
++				perl_set_use_lib=no
++			else
++				perl_library_dir="prepends to @INC with /set perl_use_lib"
++				PERL_USE_LIB="$perl_use_lib"
++			fi
+ 		fi
+ 
+ 
+@@ -15024,6 +15053,7 @@ $as_echo "ok" >&6; }
+ 
+ 
+ 
++
+ 	fi
+ fi
+ 
+@@ -17024,6 +17054,7 @@ $as_echo X"$file" |
+     cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+ # Generated automatically by $as_me ($PACKAGE) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ 
+ # Provide generalized library-building support services.
+@@ -17657,13 +17688,7 @@ if test "x$want_perl" != "xno" -a "x$per
+ fi
+ 
+ if test "x$want_perl" != "xno"; then
+-	if test "$perl_library_dir" = "PERL_USE_LIB"; then
+-		perl_library_dir=$PERL_USE_LIB
+-	fi
+-	if test -z "$perl_library_dir"; then
+-		perl_library_dir="(site default - `$perlpath -e 'use Config; print $Config{sitearch}'`)"
+-	fi
+-	echo "Perl library directory ........... : $perl_library_dir"
++	echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)"
+ 	if test "x$perl_prefix_note" = "xyes"; then
+ 		echo "  - NOTE: This was automatically set to the same directory you gave with"
+ 		echo "  --prefix. If you want the perl libraries to install to their 'correct'"
diff --git a/irc/irssi/files/patch-configure.ac b/irc/irssi/files/patch-configure.ac
new file mode 100644
index 000000000000..ae7ffc34a303
--- /dev/null
+++ b/irc/irssi/files/patch-configure.ac
@@ -0,0 +1,123 @@
+--- configure.ac.orig	2016-05-18 13:02:28.110076000 +0800
++++ configure.ac	2016-05-18 13:58:07.680765000 +0800
+@@ -79,7 +79,6 @@ AC_ARG_WITH(modules,
+ if test "x$prefix" != "xNONE"; then
+ 	prefix=`eval echo $prefix`
+ 	PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix"
+-	perl_library_dir="PERL_USE_LIB"
+ 	perl_set_use_lib=yes
+ 
+ 	perl_prefix_note=yes
+@@ -97,30 +96,35 @@ AC_ARG_WITH(perl-staticlib,
+ 
+ 
+ AC_ARG_WITH(perl-lib,
+-[  --with-perl-lib=[site|vendor|DIR]  Specify where to install the
++[  --with-perl-lib=[perl|site|vendor|DIR]  Specify where to install the
+                           Perl libraries for irssi, default is site],
+ 	if test "x$withval" = xyes; then
+ 		want_perl=yes
+ 	elif test "x$withval" = xno; then
+ 		want_perl=no
++	elif test "x$withval" = xperl; then
++		want_perl=yes
++		perl_prefix_note=no
++		PERL_MM_PARAMS="INSTALLDIRS=perl"
++		perl_set_use_lib=no
+ 	elif test "x$withval" = xsite; then
+ 		want_perl=yes
+ 		perl_prefix_note=no
+ 		PERL_MM_PARAMS=""
++		perl_set_use_lib=no
+ 	elif test "x$withval" = xvendor; then
+ 		want_perl=yes
+ 		perl_prefix_note=no
+ 		if test -z "`$perlpath -v|grep '5\.0'`"; then
+ 			PERL_MM_PARAMS="INSTALLDIRS=vendor"
+ 		else
+-			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`perl -e 'use Config; print $Config{prefix}'`"
++			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
+ 		fi
+-		perl_library_dir="(vendor default - `$perlpath -e 'use Config; print $Config{archlib}'`)"
++		perl_set_use_lib=no
+ 	else
+ 		want_perl=yes
+ 		perl_prefix_note=no
+ 		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
+-		perl_library_dir="PERL_USE_LIB"
+ 		perl_set_use_lib=yes
+ 	fi,
+ 	want_perl=yes)
+@@ -380,7 +384,7 @@ if test "$want_perl" != "no"; then
+ 		dnl * complain about them. Normally there's only few options
+ 		dnl * that we want to keep:
+ 		dnl * -Ddefine -Uundef -I/path -fopt -mopt
+-		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-[^DUIfm][^ ]+/\1/g; s/^(.* )?\+[^ ]+/\1/g'`
++		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIfm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
+ 
+ 		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
+ 		AC_SUBST(PERL_EXTRA_OPTS)
+@@ -464,13 +468,37 @@ if test "$want_perl" != "no"; then
+ 			PERL_STATIC_LIBS=0
+ 		fi
+ 
++		# remove any prefix from PERL_MM_OPT
++		PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /@<:@\s"@:>@/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"`
++		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
++		echo 'show-INSTALLDIRS:' >> Makefile.test
++		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
++		perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS`
++		if test "x$perl_INSTALLDIRS" = "xsite"; then
++			perl_library_dir="site default"
++			perl_INSTALL_VAR=INSTALLSITEARCH
++		elif test "x$perl_INSTALLDIRS" = "xvendor"; then
++			perl_library_dir="vendor default"
++			perl_INSTALL_VAR=INSTALLVENDORARCH
++		else
++			perl_library_dir="module default"
++			perl_INSTALL_VAR=INSTALLARCHLIB
++		fi
++		echo 'show-ARCHLIB:' >> Makefile.test
++		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
++		perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB`
++		rm -f Makefile.test
+ 		# figure out the correct @INC path - we'll need to do this
+ 		# through MakeMaker since it's difficult to get it right
+ 		# otherwise.
+ 		if test "x$perl_set_use_lib" = "xyes"; then
+-			perl -e 'use ExtUtils::MakeMaker; WriteMakefile("NAME" => "test", "MAKEFILE" => "Makefile.test");' $PERL_MM_PARAMS >/dev/null
+-			PERL_USE_LIB=`perl -e 'open(F, "Makefile.test"); while (<F>) { chomp; if (/^(\w+) = (.*$)/) { $keys{$1} = $2; } }; $key = $keys{INSTALLARCHLIB}; while ($key =~ /\\$\((\w+)\)/) { $value = $keys{$1}; $key =~ s/\\$\($1\)/$value/; }; print $key;'`
+-			rm -f Makefile.test
++			if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then
++				perl_library_dir="other path in @INC"
++				perl_set_use_lib=no
++			else
++				perl_library_dir="prepends to @INC with /set perl_use_lib"
++				PERL_USE_LIB="$perl_use_lib"
++			fi
+ 		fi
+ 
+ 		AC_SUBST(perl_module_lib)
+@@ -486,6 +514,7 @@ if test "$want_perl" != "no"; then
+ 		AC_SUBST(PERL_CFLAGS)
+ 
+ 		AC_SUBST(PERL_USE_LIB)
++		AC_SUBST(PERL_MM_OPT)
+ 		AC_SUBST(PERL_MM_PARAMS)
+ 		AC_SUBST(PERL_STATIC_LIBS)
+ 	fi
+@@ -724,13 +753,7 @@ if test "x$want_perl" != "xno" -a "x$per
+ fi
+ 
+ if test "x$want_perl" != "xno"; then
+-	if test "$perl_library_dir" = "PERL_USE_LIB"; then
+-		perl_library_dir=$PERL_USE_LIB
+-	fi
+-	if test -z "$perl_library_dir"; then
+-		perl_library_dir="(site default - `$perlpath -e 'use Config; print $Config{sitearch}'`)"
+-	fi
+-	echo "Perl library directory ........... : $perl_library_dir"
++	echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)"
+ 	if test "x$perl_prefix_note" = "xyes"; then
+ 		echo "  - NOTE: This was automatically set to the same directory you gave with"
+ 		echo "  --prefix. If you want the perl libraries to install to their 'correct'"