From 9214ef9e27c6ee8d44d5057d108096a767715e1e Mon Sep 17 00:00:00 2001
From: Mike Hibler <hibler@cs.utah.edu>
Date: Fri, 2 Apr 2010 09:59:52 -0600
Subject: [PATCH] No longer install the emulab p5-GD-2.07 port.

We introduced this port or an older version of GD long ago to get around an
incompatibility with perl.  Our perl has since moved on and we no longer
need this.  To be safe, we still install this on 4.x-based installs (though
I am sure many, many other things would break if someone tried to install
Emulab on FreeBSD 4.x now!)
---
 install/boss-install.in            | 15 ---------------
 install/ports/emulab-boss/Makefile |  8 ++++++--
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/install/boss-install.in b/install/boss-install.in
index 044a1d1c1..41716ecb0 100644
--- a/install/boss-install.in
+++ b/install/boss-install.in
@@ -160,7 +160,6 @@ my $TFTPD_PKG	  = "emulab-tftp-hpa-0.48";
 # XXX temporary for perl DBD mysql access
 my $P5DBD_PKG	  = "p5-DBD-mysql50-3.0002";
 # XXX temporary until fix dependencies in emulab-boss package
-my $P5GD_PKG	  = "p5-GD-2.07";
 my $PYM2_PKG	  = "py25-m2crypto-0.19.1";
 
 #
@@ -504,20 +503,6 @@ Phase "ports", "Installing ports", sub {
 			if ($pname);
 		    ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $P5DBD_PKG");
 		};
-		# XXX cannot seem to get these dependencies into emulab-boss
-		Phase "p5-GD", "Installing GD graphics package", sub {
-		    my $pname = `$PKG_INFO -E 'p5-GD-*' 2>/dev/null`;
-		    chomp($pname);
-		    if ($pname eq $P5GD_PKG) {
-			PhaseSkip("p5-GD already up to date");
-		    }
-		    if (!$packagedir) {
-			PhaseSkip("No package directory provided");
-		    }
-		    ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_DEL -f $pname")
-			if ($pname);
-		    ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $P5GD_PKG");
-		};
 		if ($FBSD_MAJOR > 6) {
 		    Phase "py-m2crypto", "Installing python m2crypto package", sub {
 			my $pname = `$PKG_INFO -E 'py25-m2crypto-*' 2>/dev/null`;
diff --git a/install/ports/emulab-boss/Makefile b/install/ports/emulab-boss/Makefile
index 08951af73..d7f39e983 100644
--- a/install/ports/emulab-boss/Makefile
+++ b/install/ports/emulab-boss/Makefile
@@ -110,7 +110,6 @@ RUN_DEPENDS=	\
 	anytopnm:${PORTSDIR}/graphics/netpbm \
 	tclsh8.4:${PORTSDIR}/lang/tcl84 \
 	otclsh:${PORTSDIR}/lang/otcl \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/misc/p5-GD-old \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/p5-SNMP \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \
@@ -154,7 +153,12 @@ RUN_DEPENDS+=	\
 # not getting installed via dependencies?
 RUN_DEPENDS+=	\
 	${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
-	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/misc/emulab-php4
+	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/misc/emulab-php4 \
+	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+.else
+# for old versions there used to be a problem with newer GD + older perl 
+RUN_DEPENDS+=	\
+	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/misc/p5-GD-old
 .endif
 
 .if ${OSMAJOR} >= 6
-- 
GitLab