- Add staging support, allow it as normal user

- Remove leading article from COMMENT
- Convert to new LIB_DEPENDS format
- Remove Author line from pkg-descr
- Docdir safe, use DOCSDIR sub in pkg-plist

4 files changed, 38 insertions, 38 deletions

diff --git a/irc/slirc/Makefile b/irc/slirc/Makefile
index 526cb71..e28e50e 100644
--- a/irc/slirc/Makefile
+++ b/irc/slirc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://members.core.com/~stabro/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A SLang-based IRC client
+COMMENT=	SLang-based IRC client
 
 LIB_DEPENDS=	${LIB_DEPENDS_LIBSLANG}
 
@@ -20,7 +20,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLANG_INCDIR?=	${LOCALBASE}/include
 SLANG_LIBDIR?=	${LOCALBASE}/lib
-LIB_DEPENDS_LIBSLANG?=	slang.2:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS_LIBSLANG?=	libslang.so.2:${PORTSDIR}/devel/libslang2
 
 MAKE_ARGS=	SLANG_INCDIR="${SLANG_INCDIR}" \
 		SLANG_LIBDIR="${SLANG_LIBDIR}" \
@@ -42,20 +42,13 @@ DOCS+=		BUGS \
 		sldocs/VFile.txt \
 		sldocs/utilsfun.txt
 
-NO_STAGE=	yes
-post-patch:
-	${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE}," ${WRKSRC}/Makefile ${WRKSRC}/scripts/init.sl
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
+
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/slirc
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/slirc/
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/slirc/files/patch-Makefile b/irc/slirc/files/patch-Makefile
index c5ad06f..f8dac4e 100644
--- a/irc/slirc/files/patch-Makefile
+++ b/irc/slirc/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Aug 24 05:42:02 1999
-+++ Makefile	Sat Jan  6 08:50:21 2001
+--- Makefile.orig	1999-08-23 22:42:02.000000000 +0200
++++ Makefile	2014-05-08 18:53:51.000000000 +0200
 @@ -1,10 +1,10 @@
  #!/bin/make -f
  
@@ -14,16 +14,24 @@
  
  pwd:=$(shell pwd)
  
-@@ -45,9 +45,9 @@
- 	[ -d $(lib_dir) ] || mkdir -p $(lib_dir)
- 	[ -d $(CFG_DIR) ] || mkdir -p $(CFG_DIR)
- 	[ -d $(script_dir) ] || mkdir -p $(script_dir)
+@@ -41,13 +41,13 @@
+ ifeq ($(CFG_DIR),$(pwd))
+ 	@echo "Running from local dir, no global install"
+ else
+-	[ -d $(bin_dir) ] || mkdir -p $(bin_dir)
+-	[ -d $(lib_dir) ] || mkdir -p $(lib_dir)
+-	[ -d $(CFG_DIR) ] || mkdir -p $(CFG_DIR)
+-	[ -d $(script_dir) ] || mkdir -p $(script_dir)
 -	install -p -o root -g root -m755 slirc $(bin_dir)
 -	install -p -o root -g root -m755 $(MODULES) $(CFG_DIR)
 -	install -p -o root -g root -m644 scripts/*.sl $(script_dir)
-+	install -p -o root -g wheel -m755 slirc $(bin_dir)
-+	install -p -o root -g wheel -m755 $(MODULES) $(CFG_DIR)
-+	install -p -o root -g wheel -m644 scripts/*.sl $(script_dir)
++	[ -d $(DESTDIR)$(bin_dir) ] || mkdir -p $(DESTDIR)$(bin_dir)
++	[ -d $(DESTDIR)$(lib_dir) ] || mkdir -p $(DESTDIR)$(lib_dir)
++	[ -d $(DESTDIR)$(CFG_DIR) ] || mkdir -p $(DESTDIR)$(CFG_DIR)
++	[ -d $(DESTDIR)$(script_dir) ] || mkdir -p $(DESTDIR)$(script_dir)
++	$(BSD_INSTALL_PROGRAM) slirc $(DESTDIR)$(bin_dir)
++	$(BSD_INSTALL_LIB) $(MODULES) $(DESTDIR)$(CFG_DIR)
++	$(BSD_INSTALL_SCRIPT) scripts/*.sl $(DESTDIR)$(script_dir)
  endif
  
  slirc: slirc.o lru.o slload.o windoze.o
diff --git a/irc/slirc/pkg-descr b/irc/slirc/pkg-descr
index c6f3d59..90161fa 100644
--- a/irc/slirc/pkg-descr
+++ b/irc/slirc/pkg-descr
@@ -2,5 +2,4 @@ SLirc is an irc client based on J.E.D.'s libslang.  It was originally
 created by Dave Cridland, and then Stan Brooks got involved and is
 maintaining the code.
 
-Author:	Stan Brooks <stabro@megsinet.net>
 WWW: http://members.core.com/~stabro/slirc.html
diff --git a/irc/slirc/pkg-plist b/irc/slirc/pkg-plist
index 145358c..fc6e88d 100644
--- a/irc/slirc/pkg-plist
+++ b/irc/slirc/pkg-plist
@@ -23,17 +23,17 @@ lib/slirc/scripts/standard.sl
 lib/slirc/scripts/tab-ex.sl
 @dirrm lib/slirc/scripts
 @dirrm lib/slirc
-%%PORTDOCS%%share/doc/slirc/BUGS
-%%PORTDOCS%%share/doc/slirc/CHANGES
-%%PORTDOCS%%share/doc/slirc/COPYING
-%%PORTDOCS%%share/doc/slirc/FAQ
-%%PORTDOCS%%share/doc/slirc/LACK-OF-WARRANTY
-%%PORTDOCS%%share/doc/slirc/README
-%%PORTDOCS%%share/doc/slirc/README.dropin
-%%PORTDOCS%%share/doc/slirc/README.gutsbonesbloodtoilsweat
-%%PORTDOCS%%%%JA%%share/doc/slirc/README.ja
-%%PORTDOCS%%share/doc/slirc/TODO
-%%PORTDOCS%%share/doc/slirc/VFile.txt
-%%PORTDOCS%%share/doc/slirc/slirc.hlp
-%%PORTDOCS%%share/doc/slirc/utilsfun.txt
-%%PORTDOCS%%@dirrm share/doc/slirc
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/LACK-OF-WARRANTY
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.dropin
+%%PORTDOCS%%%%DOCSDIR%%/README.gutsbonesbloodtoilsweat
+%%PORTDOCS%%%%JA%%%%DOCSDIR%%/README.ja
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/VFile.txt
+%%PORTDOCS%%%%DOCSDIR%%/slirc.hlp
+%%PORTDOCS%%%%DOCSDIR%%/utilsfun.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%