--- a/components/enscript/Makefile	Tue Mar 07 09:45:48 2017 -0800
+++ b/components/enscript/Makefile	Thu Mar 09 16:20:18 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -43,9 +43,9 @@
 
 # PHP enscript support
 COMPONENT_ARCHIVE_2=    php.st
-COMPONENT_ARCHIVE_HASH_2=	\
-    sha256:64d5b1ed1044202cda1ddcd591a966d1faff58d60156c4368d485f0405d7a9ee
-COMPONENT_ARCHIVE_URL_2= http://home.raxnet.net/downloads/viewcvs/php.st
+COMPONENT_ARCHIVE_HASH_2=       \
+    sha256:3224ca9e1a9707f5a1dba2688a639c13494a805642f102279b3431214801814c
+COMPONENT_ARCHIVE_URL_2= http://ez.lbm-services.de/content/download/1631/7197/file/php.st
 
 TPNO=			4380
 
@@ -68,12 +68,17 @@
 CONFIGURE_OPTIONS +=    --sysconfdir=/etc
 
 CONFIGURE_OPTIONS +=	--with-media=Letter
+
+# Needed so that the StatesBinary parameter in /etc/enscript.cfg
+# will be /usr/bin/states.
+CONFIGURE_OPTIONS +=    --bindir=/usr/bin
+
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	LDFLAGS="$(LDFLAGS)"
 
 COMPONENT_POST_INSTALL_ACTION = \
-	$(LN) $(PROTOUSRBINDIR)/$(MACH64)/enscript \
-		$(PROTOUSRBINDIR)/$(MACH64)/nenscript
+	$(LN) $(PROTOUSRBINDIR)/enscript \
+		$(PROTOUSRBINDIR)/nenscript
 
 # common targets
 build:          $(BUILD_64)

--- a/components/enscript/enscript.p5m	Tue Mar 07 09:45:48 2017 -0800
+++ b/components/enscript/enscript.p5m	Thu Mar 09 16:20:18 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -36,13 +36,13 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2010/337
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=etc/enscript.cfg
-file usr/bin/$(MACH64)/diffpp path=usr/bin/diffpp
-file usr/bin/$(MACH64)/enscript path=usr/bin/enscript
-file usr/bin/$(MACH64)/mkafmmap path=usr/bin/mkafmmap
-file usr/bin/$(MACH64)/nenscript path=usr/bin/nenscript
-file usr/bin/$(MACH64)/over path=usr/bin/over
-file usr/bin/$(MACH64)/sliceprint path=usr/bin/sliceprint
-file usr/bin/$(MACH64)/states path=usr/bin/states
+file path=usr/bin/diffpp
+file path=usr/bin/enscript
+file path=usr/bin/mkafmmap
+file path=usr/bin/nenscript
+file path=usr/bin/over
+file path=usr/bin/sliceprint
+file path=usr/bin/states
 file docs/FAQ.html path=usr/share/doc/enscript/docs/FAQ.html facet.doc.html=true
 file path=usr/share/enscript/88591.enc
 file path=usr/share/enscript/885910.enc