- cleanup

- add license

remove:
- files/patch-Makefile
- files/patch-config.mk

PR:		ports/150125
Submitted by:	Julien Laffaye <kimelto _at_ gmail.com> (maintainer)
Approved by:	jadawin (co-mentor)

4 files changed, 11 insertions, 47 deletions

diff --git a/irc/ii/Makefile b/irc/ii/Makefile
index c68870a6b36a..eda8ca724f5b 100644
--- a/irc/ii/Makefile
+++ b/irc/ii/Makefile
@@ -14,24 +14,27 @@ MASTER_SITES=	http://code.suckless.org/dl/tools/ \
 MAINTAINER=	kimelto@gmail.com
 COMMENT=	A minimalist FIFO and filesystem-based IRC client
 
+LICENSE=	MIT
+
 MAN1=	ii.1
 PLIST_FILES=	bin/ii
-PORTDOCS=	CHANGES README FAQ LICENSE
+PORTDOCS=	CHANGES README FAQ
 PORTEXAMPLES=	query.sh
 
-post-install:
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/ii ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/ii.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/CHANGES ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/FAQ ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
+.for DOCFILE in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
+.endfor
 .endif
 .if !defined(NOPORTEXAMPLES)
 	@${ECHO_MSG} "installing additional examples to ${EXAMPLESDIR}"
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/query.sh ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/query.sh ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/ii/files/patch-Makefile b/irc/ii/files/patch-Makefile
index 8cf916e71ee4..e69de29bb2d1 100644
--- a/irc/ii/files/patch-Makefile
+++ b/irc/ii/files/patch-Makefile
@@ -1,15 +0,0 @@
---- Makefile.orig	2007-07-14 20:39:41.000000000 +0200
-+++ Makefile	2008-07-17 21:27:32.000000000 +0200
-@@ -35,12 +35,10 @@
- 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
- 
- install: all
--	@mkdir -p ${DESTDIR}${DOCDIR}
- 	@mkdir -p ${DESTDIR}${BINDIR}
- 	@mkdir -p ${DESTDIR}${MAN1DIR}
- 
- 	@install -d ${DESTDIR}${BINDIR} ${DESTDIR}${MAN1DIR}
--	@install -m 644 CHANGES README query.sh FAQ LICENSE ${DESTDIR}${DOCDIR}
- 	@install -m 775 ii ${DESTDIR}${BINDIR}
- 	@install -m 444 ii.1 ${DESTDIR}${MAN1DIR}
- 	@echo "installed ii"
diff --git a/irc/ii/files/patch-config.mk b/irc/ii/files/patch-config.mk
index 997d0fcaa937..e69de29bb2d1 100644
--- a/irc/ii/files/patch-config.mk
+++ b/irc/ii/files/patch-config.mk
@@ -1,24 +0,0 @@
---- config.mk.orig	2007-07-14 20:39:41.000000000 +0200
-+++ config.mk	2008-07-13 15:38:45.000000000 +0200
-@@ -1,9 +1,9 @@
- # Customize to fit your system
- 
- # paths
--PREFIX      = /usr/local
-+PREFIX     ?= /usr/local
- BINDIR      = ${PREFIX}/bin
--MANDIR      = ${PREFIX}/share/man
-+MANDIR      = ${PREFIX}/man
- MAN1DIR     = ${MANDIR}/man1
- DOCDIR      = ${PREFIX}/share/doc/ii
- 
-@@ -22,6 +22,6 @@
- #CFLAGS      = -g ${INCLUDES} -DVERSION=\"${VERSION}\"
- 
- # compiler
--CC          = cc
--CFLAGS      = -g -O0 -W -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
--LDFLAGS     = ${LIBS}
-+CC         ?= cc
-+CFLAGS     += -g -O0 -W -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
-+LDFLAGS    += ${LIBS}
diff --git a/irc/ii/pkg-descr b/irc/ii/pkg-descr
index 1530588220fb..46b1af2efd77 100644
--- a/irc/ii/pkg-descr
+++ b/irc/ii/pkg-descr
@@ -6,4 +6,4 @@ contain the server messages. For every channel and every nick name there
 are related in and out files created. This allows IRC communication from
 command line and adheres to the Unix philosophy.
 
-WWW: http://www.suckless.org/programs/ii.html
+WWW:	http://tools.suckless.org/ii/