--- Makefile	(revision 359709)
+++ Makefile	(working copy)
@@ -7,7 +7,7 @@ 
 CATEGORIES=	www perl5
 MASTER_SITES=	http://ftp.icdevgroup.org/interchange/5.6/tar/
 
-MAINTAINER=	loader@freebsdmall.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RedHat's database-enabled e-commerce server
 
 RUN_DEPENDS=	p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \
@@ -17,14 +17,14 @@ 
 		p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-USES=		perl5
-USE_PERL5=	configure
-USE_BZIP2=	yes
+USES=		perl5 tar:bzip2
 
-OPTIONS_DEFINE=	MYSQL PGSQL
+USERS=		interch
+GROUPS=		interch
+
+OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 USE_RC_SUBR=	interchange
@@ -39,80 +39,26 @@ 
 
 ARCH_PERL=	${SITE_PERL}/${PERL_ARCH}
 
-MAN1=		compile_link.1 \
-		config_prog.1 \
-		configdump.1 \
-		crontab.1 \
-		expire.1 \
-		expireall.1 \
-		findtags.1 \
-		ic_mod_perl.1 \
-		interchange.1 \
-		localize.1 \
-		makecat.1 \
-		offline.1 \
-		restart.1 \
-		update.1
-
-MAN3=		Vend::Accounting::SQL_Ledger.3 \
-		Vend::Cart.3 \
-		Vend::CounterFile.3 \
-		Vend::Form.3 \
-		Vend::Interpolate.3 \
-		Vend::Options::Matrix.3 \
-		Vend::Options::Old48.3 \
-		Vend::Options::Simple.3 \
-		Vend::Parser.3 \
-		Vend::Payment::AuthorizeNet.3 \
-		Vend::Payment::BoA.3 \
-		Vend::Payment::BusinessOnlinePayment.3 \
-		Vend::Payment::CyberCash.3 \
-		Vend::Payment::ECHO.3 \
-		Vend::Payment::EFSNet.3 \
-		Vend::Payment::Ezic.3 \
-		Vend::Payment::Getitcard.3 \
-		Vend::Payment::ICS.3 \
-		Vend::Payment::Linkpoint.3 \
-		Vend::Payment::MCVE.3 \
-		Vend::Payment::NetBilling.3 \
-		Vend::Payment::Protx2.3 \
-		Vend::Payment::PRI.3 \
-		Vend::Payment::PSiGate.3 \
-		Vend::Payment::Sage.3 \
-		Vend::Payment::Signio.3 \
-		Vend::Payment::Skipjack.3 \
-		Vend::Payment::TCLink.3 \
-		Vend::Payment::TestPayment.3 \
-		Vend::Payment::iTransact.3 \
-		Vend::SOAP::Transport.3 \
-		Vend::SQL_Parser.3 \
-		Vend::Ship.3 \
-		Vend::Ship::Postal.3 \
-		Vend::Ship::QueryUPS.3 \
-		Vend::Table::Editor.3 \
-		Vend::UserControl.3 \
-		Vend::UserDB.3
-
-MAKE_ARGS+=	NOCPANINSTALL=1 \
-		INSTALLARCHLIB=${PREFIX}/interchange/ \
-		INSTALLPRIVLIB=${PREFIX}/interchange/lib/ \
-		INSTALLMAN1DIR=${PREFIX}/man/man1
-
+CONFIGURE_SCRIPT=	Makefile.PL
+CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}/interchange"
+CONFIGURE_ARGS+=	INSTALLPRIVLIB="${PREFIX}/${SITE_PERL_REL}/"
+CONFIGURE_ARGS+=	INSTALLARCHLIB="${PREFIX}/interchange/"
+CONFIGURE_ARGS+=	INSTALLMAN1DIR="${PREFIX}/man/man1/"
+CONFIGURE_ARGS+=	INSTALLMAN3DIR="${PREFIX}/man/man3/"
+CONFIGURE_ARGS+=	INSTALLBIN="${PREFIX}/bin/"
+CONFIGURE_ARGS+=	INSTALLSCRIPT="${PREFIX}/bin/"
 CONFIGURE_ARGS+=	force=1
 
-post-patch:
-	@${REINPLACE_CMD} -e "s:You are now ready to cd to \$$realdir:You are now ready to cd to ${PREFIX}:g" ${WRKSRC}/Makefile.PL
+do-configure:
+	@cd ${CONFIGURE_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} \
+		${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 
-pre-configure:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
-
 pre-install:
-	@${MKDIR} ${PREFIX}/interchange
+	@${MKDIR} ${STAGEDIR}${PREFIX}/interchange/
+	@${MKDIR} ${STAGEDIR}/var/run/interchange/
 
 post-install:
-.for i in compile_link config_prog configdump expire expireall interchange localize makecat offline restart update
-	@${REINPLACE_CMD} -i "" -e "s:${PREFIX}:${PREFIX}/interchange:g; s:${PREFIX}/interchange/bin: ${PREFIX}/bin:g" ${PREFIX}/bin/${i}
-.endfor
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
+	@${RM} -fr ${STAGEDIR}${PREFIX}/interchange/auto/
 
 .include <bsd.port.mk>
--- files/patch-Makefile.PL	(revision 0)
+++ files/patch-Makefile.PL	(working copy)
@@ -0,0 +1,43 @@ 
+--- ./Makefile.PL.orig	2008-11-10 06:46:45.000000000 +0000
++++ ./Makefile.PL	2014-06-29 18:54:00.000000000 +0000
+@@ -330,7 +330,8 @@
+ 				qq{Interchange cannot be run as root. Which user should run Interchange? },
+ 				($uid || 'interch'),
+ 			);
+-			my $name = getpwnam($uid);
++			# my $name = getpwnam($uid);
++			my $name = 95;
+ 			if(! $name) {
+ 				my $ans = my_prompt("User name $uid doesn't exist. Use anyway? ", 'n');
+ 				last GETUID if $ans =~ /^\s*y/i;
+@@ -537,8 +538,10 @@
+ 				or die "Can't open uid file: $!\n";
+ 			my $uid = <UID>;
+ 			close UID;
+-			$MV::Default{INTERCHANGE_UID} = getpwnam($uid);
+-			$MV::Default{INTERCHANGE_GID} = getgrnam($uid);
++			# $MV::Default{INTERCHANGE_UID} = getpwnam($uid);
++			# $MV::Default{INTERCHANGE_GID} = getgrnam($uid);
++			$MV::Default{INTERCHANGE_UID} = 95;
++			$MV::Default{INTERCHANGE_GID} = 95;
+ 			for(@chown_files) {
+ 				chown	$MV::Default{INTERCHANGE_UID},
+ 						$MV::Default{INTERCHANGE_GID},
+@@ -685,7 +688,7 @@
+ 		else {
+ 		print <<EOF;
+ 
+-You are now ready to cd to $realdir and run 'bin/makecat'
++You are now ready to cd to $ENV{PREFIX} and run 'bin/makecat'
+ to set up your first catalog.
+ 
+ EOF
+@@ -738,7 +741,7 @@
+ 		next unless $MV::Default{$_};
+ 		push @args, "$_=$MV::Default{$_}";
+ 	}
+-	push @args, 'final=$(INSTALLARCHLIB)';
++	push @args, 'final=$(DESTDIR)$(INSTALLARCHLIB)';
+ 
+ 	my $argstring = join " ", @args;
+ 
--- pkg-install	(revision 359709)
+++ pkg-install	(working copy)
@@ -9,37 +9,6 @@ 
 GID=${UID}
 
 case $2 in
-PRE-INSTALL)
-	USER=interch
-	GROUP=${USER}
-	UID=95
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-                echo "You already have a group \"${GROUP}\", so I will use it."
-        else
-                if pw groupadd ${GROUP} -g ${GID}; then
-                        echo "Added group \"${GROUP}\"."
-                else
-                        echo "Adding group \"${GROUP}\" failed..."
-                        exit 1
-                fi
-        fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-                echo "You already have a user \"${USER}\", so I will use it."
-        else
-                if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-                        -d "${PKG_PREFIX}/interchange" \
-			-s /bin/sh -c "Interchange user"
-                then
-                        echo "Added user \"${USER}\"."
-                else
-                        echo "Adding user \"${USER}\" failed..."
-                        exit 1
-                fi
-        fi
-        ;;
 POST-INSTALL)
 	/usr/bin/install -d -m 755 -o ${USER} -g ${GROUP} /var/run/interchange
 	/usr/sbin/chown -R ${USER}:${GROUP} ${PKG_PREFIX}/interchange
--- pkg-plist	(revision 359709)
+++ pkg-plist	(working copy)
@@ -12,6 +12,7 @@ 
 bin/offline
 bin/restart
 bin/update
+interchange/_allow_threads
 interchange/_session_storable
 interchange/_uid
 interchange/catalog_after.cfg
@@ -349,7 +350,7 @@ 
 interchange/code/Widget/value.widget
 interchange/code/Widget/yesno.widget
 interchange/code/Widget/ynzero.widget
-@unexec if [ `cat %D/interchange/error.log | wc -l` -le 1 ]; then rm -f %D/interchange/error.log; fi
+interchange/error.log
 interchange/etc/.empty
 interchange/etc/jobs/db/export
 interchange/etc/jobs/maintenance/logrotate
@@ -1724,8 +1725,59 @@ 
 %%SITE_PERL%%/auto/Vend/Tags/autosplit.ix
 %%SITE_PERL%%/hints.pl
 %%SITE_PERL%%/install_lsb.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange/.packlist
 %%SITE_PERL%%/relocate.pl
+man/man1/compile_link.1.gz
+man/man1/config_prog.1.gz
+man/man1/configdump.1.gz
+man/man1/crontab.1.gz
+man/man1/expire.1.gz
+man/man1/expireall.1.gz
+man/man1/findtags.1.gz
+man/man1/ic_mod_perl.1.gz
+man/man1/interchange.1.gz
+man/man1/localize.1.gz
+man/man1/makecat.1.gz
+man/man1/offline.1.gz
+man/man1/restart.1.gz
+man/man1/update.1.gz
+man/man3/Vend::UserDB.3.gz
+man/man3/Vend::Parser.3.gz
+man/man3/Vend::Payment::CyberCash.3.gz
+man/man3/Vend::CounterFile.3.gz
+man/man3/Vend::Table::Editor.3.gz
+man/man3/Vend::Payment::TestPayment.3.gz
+man/man3/Vend::Payment::TCLink.3.gz
+man/man3/Vend::UserControl.3.gz
+man/man3/Vend::SOAP::Transport.3.gz
+man/man3/Vend::Payment::Ezic.3.gz
+man/man3/Vend::Payment::iTransact.3.gz
+man/man3/Vend::Options::Matrix.3.gz
+man/man3/Vend::Payment::ECHO.3.gz
+man/man3/Vend::Payment::ICS.3.gz
+man/man3/Vend::Ship.3.gz
+man/man3/Vend::Payment::BusinessOnlinePayment.3.gz
+man/man3/Vend::Payment::Sage.3.gz
+man/man3/Vend::Payment::MCVE.3.gz
+man/man3/Vend::Accounting::SQL_Ledger.3.gz
+man/man3/Vend::Interpolate.3.gz
+man/man3/Vend::Payment::PSiGate.3.gz
+man/man3/Vend::Payment::AuthorizeNet.3.gz
+man/man3/Vend::Payment::NetBilling.3.gz
+man/man3/Vend::Payment::PRI.3.gz
+man/man3/Vend::Payment::Protx2.3.gz
+man/man3/Vend::Cart.3.gz
+man/man3/Vend::Payment::Getitcard.3.gz
+man/man3/Vend::Payment::EFSNet.3.gz
+man/man3/Vend::Payment::BoA.3.gz
+man/man3/Vend::Form.3.gz
+man/man3/Vend::Payment::Skipjack.3.gz
+man/man3/Vend::Options::Simple.3.gz
+man/man3/Vend::Options::Old48.3.gz
+man/man3/Vend::Ship::QueryUPS.3.gz
+man/man3/Vend::SQL_Parser.3.gz
+man/man3/Vend::Ship::Postal.3.gz
+man/man3/Vend::Payment::Signio.3.gz
+man/man3/Vend::Payment::Linkpoint.3.gz
 @dirrm %%SITE_PERL%%/Vend/Table
 @dirrm %%SITE_PERL%%/Vend/Ship
 @dirrm %%SITE_PERL%%/Vend/SOAP
@@ -1736,7 +1788,6 @@ 
 @dirrm %%SITE_PERL%%/auto/Vend/Tags
 @dirrm %%SITE_PERL%%/auto/Vend/SOAP
 @dirrm %%SITE_PERL%%/auto/Vend
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange
 @dirrm interchange/standard/variables
 @dirrm interchange/standard/upload
 @dirrm interchange/standard/templates/regions