svn commit: r348610 - in head/irc/py-fishcrypt: . files

[Rusmir Dusko]

Author: nemysis
Date: Wed Mar 19 10:55:44 2014
New Revision: 348610
URL: http://svnweb.freebsd.org/changeset/ports/348610
QAT: https://qat.redports.org/buildarchive/r348610/

Log:
  - Remove license (BSD), upstream didn't know which BSD license it is
  
      https://github.com/kwaaak/py-fishcrypt/issues/1
  
  - Add USES dos2unix
  - Reordering Options and change according to pkg-message

Modified:
  head/irc/py-fishcrypt/Makefile
  head/irc/py-fishcrypt/files/pkg-message.in

Modified: head/irc/py-fishcrypt/Makefile
==============================================================================
--- head/irc/py-fishcrypt/Makefile	Wed Mar 19 08:59:14 2014	(r348609)
+++ head/irc/py-fishcrypt/Makefile	Wed Mar 19 10:55:44 2014	(r348610)
@@ -9,8 +9,6 @@ DIST_SUBDIR=	python
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	FiSH/Mircryption clone for XChat/HexChat
 
-LICENSE=	BSD
-
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
 
 USE_GITHUB=	yes
@@ -19,6 +17,7 @@ GH_PROJECT=	py-fishcrypt
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT= 	c001c75
 
+USES=		dos2unix
 USE_PYTHON_RUN=	yes
 NO_BUILD=	yes
 
@@ -29,22 +28,15 @@ PORTDOCS=	README.md
 PLIST_FILES=	%%DATADIR%%/fishcrypt.py
 PLIST_DIRS=     %%DATADIR%%
 
-OPTIONS_DEFINE=	DOCS XCHAT HEXCHAT
+OPTIONS_DEFINE=	DOCS HEXCHAT XCHAT
 
-XCHAT_DESC=		FiSH encryption for XChat
 HEXCHAT_DESC=		FiSH encryption for HexChat
+XCHAT_DESC=		FiSH encryption for XChat
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXCHAT}
-RUN_DEPENDS+=	xchat:${PORTSDIR}/irc/xchat
-.endif
-
-.if ${PORT_OPTIONS:MHEXCHAT}
-RUN_DEPENDS+=	hexchat:${PORTSDIR}/irc/hexchat
-.endif
+HEXCHAT_RUN_DEPENDS=	hexchat:${PORTSDIR}/irc/hexchat
+XCHAT_RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

Modified: head/irc/py-fishcrypt/files/pkg-message.in
==============================================================================
--- head/irc/py-fishcrypt/files/pkg-message.in	Wed Mar 19 08:59:14 2014	(r348609)
+++ head/irc/py-fishcrypt/files/pkg-message.in	Wed Mar 19 10:55:44 2014	(r348610)
@@ -6,14 +6,14 @@ To make FiSH work with with py-fishcrypt
 
     su user
 
-For XChat
+For HexChat
 
-    ln -sf %%DATADIR%%/fishcrypt.py ~/.xchat2/
+    ln -sf %%DATADIR%%/fishcrypt.py ~/.config/hexchat/addons/
 
 
-For HexChat
+For XChat
 
-    ln -sf %%DATADIR%%/fishcrypt.py ~/.config/hexchat/addons/
+    ln -sf %%DATADIR%%/fishcrypt.py ~/.xchat2/
 
     exit