Support STAGEDIR.

PR:		ports/193159
Submitted by:	Ports Fury.

6 files changed, 49 insertions, 34 deletions

diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index 1c0bea6f4d3b..91a553e678ce 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -3,19 +3,17 @@
 
 PORTNAME=	libslang
 PORTVERSION=	${VERSION}.j${JP_VERSION}
+PORTREVISION=	1
 CATEGORIES=	japanese devel
 MASTER_SITES=	http://www.emaillab.org/mutt/tools/ \
-		http://my.reset.jp/~iwashita/mutt/distfiles/ \
-		http://www.actweb.ne.jp/k-yosino/
+		http://my.reset.jp/~iwashita/mutt/distfiles/
 DISTNAME=	slang-${VERSION}jp${JP_VERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library permits a programmer to develop software
 
-CONFLICTS=	libslang2-[0-9]* libslang-1.*[^j]*
-
-VERSION=	1.4.5
-JP_VERSION=	2
+LICENSE=	ART10 GPLv2
+LICENSE_COMB=	dual
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
@@ -24,8 +22,18 @@ INSTALL_TARGET=	install-elf
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
+CONFLICTS=	libslang2-[0-9]* libslang-1.*[^j]*
+
+DOCSDIR=	${PREFIX}/share/doc/slang
+
+OPTIONS_DEFINE=	DOCS
+
+VERSION=	1.4.5
+JP_VERSION=	2
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
+	(cd ${WRKSRC} && ${INSTALL_DATA} slang-j.doc \
+		${STAGEDIR}${DOCSDIR})
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libslang.so.[0-9]*
 
 .include <bsd.port.mk>
diff --git a/japanese/libslang/files/patch-ad b/japanese/libslang/files/patch-ad
deleted file mode 100644
index f96e37084d4a..000000000000
--- a/japanese/libslang/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue May  7 00:20:07 2002
-+++ src/Makefile.in	Tue May  7 00:21:34 2002
-@@ -38,7 +38,7 @@
- exec_prefix = @exec_prefix@
- install_lib_dir = @libdir@
- install_include_dir = @includedir@
--install_doc_dir = $(prefix)/doc/slang
-+install_doc_dir = $(prefix)/share/doc/slang
- DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
- MODULE_INSTALL_DIR = @libdir@/slang/modules
- #---------------------------------------------------------------------------
diff --git a/japanese/libslang/files/patch-ac b/japanese/libslang/files/patch-autoconf__Makefile.in
index 0cad8f4278af..0cad8f4278af 100644
--- a/japanese/libslang/files/patch-ac
+++ b/japanese/libslang/files/patch-autoconf__Makefile.in
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-configure
index 1356b0fdb948..1356b0fdb948 100644
--- a/japanese/libslang/files/patch-aa
+++ b/japanese/libslang/files/patch-configure
diff --git a/japanese/libslang/files/patch-src__Makefile.in b/japanese/libslang/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..19fcf94aebcd
--- /dev/null
+++ b/japanese/libslang/files/patch-src__Makefile.in
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	Tue May  7 00:20:07 2002
++++ src/Makefile.in	Tue May  7 00:21:34 2002
+@@ -38,8 +38,8 @@
+ exec_prefix = @exec_prefix@
+ install_lib_dir = @libdir@
+ install_include_dir = @includedir@
+-install_doc_dir = $(prefix)/doc/slang
+-DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
++install_doc_dir = $(prefix)/share/doc/slang
++DOC_FILES = ../changes.txt ../COPYING ../doc/slangdoc.html ../doc/text/*.txt
+ MODULE_INSTALL_DIR = @libdir@/slang/modules
+ #---------------------------------------------------------------------------
+ # DESTDIR is designed to facilitate making packages.  Normally it is empty
+@@ -150,7 +150,6 @@
+ 	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)
+ 	$(INSTALL_DATA) $(SRCDIR)/slkanji.h $(DEST_INCDIR)
+ install_docs: $(DEST_DOCDIR)
+-	$(INSTALL_DATA) $(DOC_FILES) $(install_doc_dir)/
+ 	@for i in $(DOC_FILES); \
+ 	do \
+ 		echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
diff --git a/japanese/libslang/pkg-plist b/japanese/libslang/pkg-plist
index c29dd4dcd428..d9632145dc71 100644
--- a/japanese/libslang/pkg-plist
+++ b/japanese/libslang/pkg-plist
@@ -1,19 +1,16 @@
-lib/libslang.a
-lib/libslang.so
-lib/libslang.so.2
 include/slang/slang.h
 include/slang/slcurses.h
 include/slang/slkanji.h
+lib/libslang.a
+lib/libslang.so
+lib/libslang.so.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/cref.txt
+%%PORTDOCS%%%%DOCSDIR%%/cslang.txt
+%%PORTDOCS%%%%DOCSDIR%%/slang.txt
+%%PORTDOCS%%%%DOCSDIR%%/slangdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/slangfun.txt
+%%PORTDOCS%%%%DOCSDIR%%/slang-j.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/slang
-share/doc/slang/COPYING
-share/doc/slang/COPYING.ART
-share/doc/slang/COPYING.GPL
-share/doc/slang/COPYRIGHT
-share/doc/slang/changes.txt
-share/doc/slang/cref.txt
-share/doc/slang/cslang.txt
-share/doc/slang/slang.txt
-share/doc/slang/slangdoc.html
-share/doc/slang/slangfun.txt
-share/doc/slang/slang-j.doc
-@dirrm share/doc/slang