Index: branches/2014Q4/print/hplip-plugin/Makefile
===================================================================
--- branches/2014Q4/print/hplip-plugin/Makefile	(revision 371805)
+++ branches/2014Q4/print/hplip-plugin/Makefile	(revision 371806)
@@ -1,78 +1,78 @@
 # Created by: amistry@am-productions.biz
 # $FreeBSD$
 
 PORTNAME=	hplip-plugin
 PORTVERSION=	3.14.4
 PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/
+MASTER_SITES=	http://hplipopensource.com/hplip-web/plugin/
 DISTNAME=	hplip-${DISTVERSION}-plugin
 EXTRACT_SUFX=	.run
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Binary plugin for some HP Printers and All-in-One devices
 
 RUN_DEPENDS=	hp-plugin:${PORTSDIR}/print/hplip
 
 RESTRICTED=	License agreement is required
 
 USE_PYTHON=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/plugin_tmp
 HPLIP_FAKEDIR=	${WRKDIR}/hplip_fakedir
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 PLUGIN_LINKS=	fax/plugins/fax_marvell \
 		prnt/plugins/hbpl1 \
 		prnt/plugins/lj \
 		scan/plugins/bb_marvell \
 		scan/plugins/bb_soap \
 		scan/plugins/bb_soapht
 
 PLUGIN_DIRS=	data/firmware \
 		data/plugins \
 		fax/plugins \
 		prnt/plugins \
 		scan/plugins
 
 PLIST_SUB+=	LINARCH="${LINARCH}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 LINARCH=	x86_32
 .elif ${ARCH} == "amd64"
 LINARCH=	x86_64
 .endif
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} && ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} --keep --noexec
 
 post-patch:
 	${REINPLACE_CMD} -e 's|ok, ans = tui.enter_yes_no.*|ok, ans = 1, 1|' \
 		${WRKSRC}/plugin_install.py
 	${REINPLACE_CMD} -e 's|rules,||;s|rules_alt,||' ${WRKSRC}/plugin.spec
 	${REINPLACE_CMD} -e 's|/etc/hp|${HPLIP_FAKEDIR}|g' \
 		${WRKSRC}/plugin_install.py
 
 do-install:
 # fake hplip installation
 	${MKDIR} ${HPLIP_FAKEDIR}
 	${SED} -e 's,${LOCALBASE}/share/hplip,${HPLIP_FAKEDIR},' \
 		${LOCALBASE}/etc/hp/hplip.conf > ${HPLIP_FAKEDIR}/hplip.conf
 	${MKDIR} ${HPLIP_FAKEDIR}
 	${LN} -sf ${LOCALBASE}/share/hplip/base ${HPLIP_FAKEDIR}
 	${LN} -sf ${LOCALBASE}/share/hplip/prnt ${HPLIP_FAKEDIR}
 	${CP} -R ${LOCALBASE}/share/hplip/installer ${HPLIP_FAKEDIR}
 	${REINPLACE_CMD} -e 's,HOMEDIR = .*,HOMEDIR = "${STAGEDIR}${PREFIX}/share/hplip",' \
 		${HPLIP_FAKEDIR}/installer/pluginhandler.py
 # install hplip-plugin
 	${MKDIR} ${PLUGIN_DIRS:S,^,${STAGEDIR}${PREFIX}/share/hplip/,}
 	(cd ${WRKSRC} && ${PYTHON_CMD} -B plugin_install.py)
 .for i in ${PLUGIN_LINKS}
 	${LN} -sf ${i:T}-${LINARCH}.so ${STAGEDIR}${PREFIX}/share/hplip/${i}.so
 .endfor
 
 .include <bsd.port.post.mk>
Index: branches/2014Q4/print/hplip-plugin/pkg-plist
===================================================================
--- branches/2014Q4/print/hplip-plugin/pkg-plist	(revision 371805)
+++ branches/2014Q4/print/hplip-plugin/pkg-plist	(revision 371806)
@@ -1,34 +1,27 @@
 share/hplip/data/firmware/hp_laserjet_1000.fw.gz
 share/hplip/data/firmware/hp_laserjet_1005_series.fw.gz
 share/hplip/data/firmware/hp_laserjet_1018.fw.gz
 share/hplip/data/firmware/hp_laserjet_1020.fw.gz
 share/hplip/data/firmware/hp_laserjet_p1005.fw.gz
 share/hplip/data/firmware/hp_laserjet_p1006.fw.gz
 share/hplip/data/firmware/hp_laserjet_p1007.fw.gz
 share/hplip/data/firmware/hp_laserjet_p1008.fw.gz
 share/hplip/data/firmware/hp_laserjet_p1009.fw.gz
 share/hplip/data/firmware/hp_laserjet_p1505.fw.gz
 share/hplip/data/firmware/hp_laserjet_professional_p1102.fw.gz
 share/hplip/data/firmware/hp_laserjet_professional_p1102w.fw.gz
 share/hplip/data/firmware/hp_laserjet_professional_p1566.fw.gz
 share/hplip/data/plugins/license.txt
 share/hplip/fax/plugins/fax_marvell-%%LINARCH%%.so
 share/hplip/fax/plugins/fax_marvell.so
 share/hplip/plugin.spec
 share/hplip/prnt/plugins/hbpl1-%%LINARCH%%.so
 share/hplip/prnt/plugins/hbpl1.so
 share/hplip/prnt/plugins/lj-%%LINARCH%%.so
 share/hplip/prnt/plugins/lj.so
 share/hplip/scan/plugins/bb_marvell-%%LINARCH%%.so
 share/hplip/scan/plugins/bb_marvell.so
 share/hplip/scan/plugins/bb_soap-%%LINARCH%%.so
 share/hplip/scan/plugins/bb_soap.so
 share/hplip/scan/plugins/bb_soapht-%%LINARCH%%.so
 share/hplip/scan/plugins/bb_soapht.so
-@dirrm share/hplip/scan/plugins
-@dirrmtry share/hplip/scan
-@dirrm share/hplip/prnt/plugins
-@dirrm share/hplip/fax/plugins
-@dirrmtry share/hplip/fax
-@dirrm share/hplip/data/plugins
-@dirrm share/hplip/data/firmware
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 371805)
+++ branches/2014Q4	(revision 371806)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r371794