diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile
index 88100bb49530..e62f12eca510 100644
--- a/comms/esmska/Makefile
+++ b/comms/esmska/Makefile
@@ -21,26 +21,24 @@ SUB_FILES=	esmska
 
 PORTDOCS=	readme.txt
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/esmska.jar ${DATADIR}/
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} gateways ${DATADIR}/)
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} icons ${DATADIR}/)
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} lib ${DATADIR}/)
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} license ${DATADIR}/)
-	${INSTALL_SCRIPT} ${WRKDIR}/esmska ${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/esmska.jar ${STAGEDIR}${DATADIR}/
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} gateways ${STAGEDIR}${DATADIR}/)
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} icons ${STAGEDIR}${DATADIR}/)
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR}/)
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} license ${STAGEDIR}${DATADIR}/)
+	${INSTALL_SCRIPT} ${WRKDIR}/esmska ${STAGEDIR}${PREFIX}/bin/
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/comms/esmska/pkg-plist b/comms/esmska/pkg-plist
index 64831f7964bf..03d4a6726e67 100644
--- a/comms/esmska/pkg-plist
+++ b/comms/esmska/pkg-plist
@@ -1,46 +1,46 @@
 bin/esmska
 %%DATADIR%%/esmska.jar
-%%DATADIR%%/gateways/deprecated.xml
 %%DATADIR%%/gateways/[CZ]O2.gateway
 %%DATADIR%%/gateways/[CZ]O2.png
-%%DATADIR%%/gateways/[CZ]O2_SMSender.gateway
-%%DATADIR%%/gateways/[CZ]O2_SMSender.png
 %%DATADIR%%/gateways/[CZ]O2_(registrace).gateway
 %%DATADIR%%/gateways/[CZ]O2_(registrace).png
+%%DATADIR%%/gateways/[CZ]O2_SMSender.gateway
+%%DATADIR%%/gateways/[CZ]O2_SMSender.png
 %%DATADIR%%/gateways/[CZ]PoslatSMS.cz.gateway
 %%DATADIR%%/gateways/[CZ]PoslatSMS.cz.png
-%%DATADIR%%/gateways/[CZ]smska.cz.gateway
-%%DATADIR%%/gateways/[CZ]smska.cz.png
-%%DATADIR%%/gateways/[CZ]SMSmania_(O2).gateway
-%%DATADIR%%/gateways/[CZ]SMSmania_(O2).png
 %%DATADIR%%/gateways/[CZ]SMS.cz.gateway
 %%DATADIR%%/gateways/[CZ]SMS.cz.png
+%%DATADIR%%/gateways/[CZ]SMSmania_(O2).gateway
+%%DATADIR%%/gateways/[CZ]SMSmania_(O2).png
 %%DATADIR%%/gateways/[CZ]T-mobile.gateway
 %%DATADIR%%/gateways/[CZ]T-mobile.png
-%%DATADIR%%/gateways/[CZ]t-zones.gateway
-%%DATADIR%%/gateways/[CZ]t-zones.png
 %%DATADIR%%/gateways/[CZ]Vodafone.gateway
 %%DATADIR%%/gateways/[CZ]Vodafone.png
 %%DATADIR%%/gateways/[CZ]Vodafone_park.gateway
 %%DATADIR%%/gateways/[CZ]Vodafone_park.png
+%%DATADIR%%/gateways/[CZ]smska.cz.gateway
+%%DATADIR%%/gateways/[CZ]smska.cz.png
+%%DATADIR%%/gateways/[CZ]t-zones.gateway
+%%DATADIR%%/gateways/[CZ]t-zones.png
 %%DATADIR%%/gateways/[DK]CoolSMS_(FriSMS).gateway
 %%DATADIR%%/gateways/[DK]CoolSMS_(FriSMS).png
 %%DATADIR%%/gateways/[DK]CoolSMS_(GratisSMS).gateway
 %%DATADIR%%/gateways/[DK]CoolSMS_(GratisSMS).png
 %%DATADIR%%/gateways/[INT]GoSMS.gateway
 %%DATADIR%%/gateways/[INT]GoSMS.png
+%%DATADIR%%/gateways/[INT]SMS_Global.gateway
+%%DATADIR%%/gateways/[INT]SMS_Global.png
 %%DATADIR%%/gateways/[INT]SMSdiscount.gateway
 %%DATADIR%%/gateways/[INT]SMSdiscount.png
 %%DATADIR%%/gateways/[INT]sms4you.gateway
 %%DATADIR%%/gateways/[INT]sms4you.png
-%%DATADIR%%/gateways/[INT]SMS_Global.gateway
-%%DATADIR%%/gateways/[INT]SMS_Global.png
 %%DATADIR%%/gateways/[LT]dos.lt.gateway
 %%DATADIR%%/gateways/[LT]dos.lt.png
 %%DATADIR%%/gateways/[SK]Orange.gateway
 %%DATADIR%%/gateways/[SK]Orange.png
 %%DATADIR%%/gateways/[SK]Orange_(plateny).gateway
 %%DATADIR%%/gateways/[SK]Orange_(plateny).png
+%%DATADIR%%/gateways/deprecated.xml
 %%DATADIR%%/icons/esmska.ico
 %%DATADIR%%/icons/esmska.png
 %%DATADIR%%/icons/esmska.svg
@@ -54,14 +54,14 @@ bin/esmska
 %%DATADIR%%/lib/commons-lang-2.4.jar
 %%DATADIR%%/lib/commons-logging-1.1.1.jar
 %%DATADIR%%/lib/javacsv-2.0.jar
-%%DATADIR%%/lib/js-engine.jar
 %%DATADIR%%/lib/js-1.7R1.jar
+%%DATADIR%%/lib/js-engine.jar
 %%DATADIR%%/lib/looks-2.1.4.jar
 %%DATADIR%%/lib/org-openide-awt.jar
 %%DATADIR%%/lib/org-openide-util.jar
+%%DATADIR%%/lib/substance-6.1.jar
 %%DATADIR%%/lib/substance-extras-6.0.jar
 %%DATADIR%%/lib/substance-swingx-6.0.jar
-%%DATADIR%%/lib/substance-6.1.jar
 %%DATADIR%%/lib/swingx.jar
 %%DATADIR%%/lib/trident-1.3.jar
 %%DATADIR%%/license/gnu-agpl.txt