Move OTP application to ${PREFIX}/lib/erlang/lib, so it is easier to build

releases without adding paths by hand.

3 files changed, 44 insertions, 40 deletions

diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 6e1a25fe2124..4efc2d29489d 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yaws
 PORTVERSION=	1.45
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
@@ -17,6 +17,8 @@ COMMENT=	A webserver for dynamic content written in Erlang
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -24,6 +26,8 @@ USE_REINPLACE=	yes
 MAN1=		yaws.1
 MAN5=		yaws.conf.5 yaws_api.5
 
+APPDIR=${PREFIX}/lib/erlang/lib/yaws-${PORTVERSION}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
@@ -43,13 +47,13 @@ post-patch:
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/yaws ${PREFIX}/bin
 	@${INSTALL_DATA} ${FILESDIR}/yaws.conf.sample ${PREFIX}/etc/
-	@${MKDIR} ${PREFIX}/lib/yaws/ebin
-	@${MKDIR} ${PREFIX}/lib/yaws/include
-	@${MKDIR} ${PREFIX}/lib/yaws/priv
+	@${MKDIR} ${APPDIR}/ebin
+	@${MKDIR} ${APPDIR}/include
+	@${MKDIR} ${APPDIR}/priv
 	@${MKDIR} ${PREFIX}/www/yaws
-	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${PREFIX}/lib/yaws/ebin
-	@${INSTALL_DATA} ${WRKSRC}/priv/* ${PREFIX}/lib/yaws/priv
-	@${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/lib/yaws/include
+	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${APPDIR}/ebin
+	@${INSTALL_DATA} ${WRKSRC}/priv/* ${APPDIR}/priv
+	@${INSTALL_DATA} ${WRKSRC}/include/* ${APPDIR}/include
 	@cd ${WRKSRC}/www && (${FIND} * | ${CPIO} -pu ${PREFIX}/www/yaws)
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/www/yaws
 	@${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
diff --git a/www/yaws/files/patch-scripts_yaws.template b/www/yaws/files/patch-scripts_yaws.template
index 80167320775d..9644e8bfa0cd 100644
--- a/www/yaws/files/patch-scripts_yaws.template
+++ b/www/yaws/files/patch-scripts_yaws.template
@@ -8,7 +8,7 @@ $FreeBSD$
  
  
 -yawsdir="%yawsdir%"
-+yawsdir=!!PREFIX!!/lib/yaws
++yawsdir=""
  erl="%erl%"
  case `uname` in
      CYGWIN*)
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index 86e126251d3e..2864fb5cc26b 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -1,33 +1,33 @@
 bin/yaws
 etc/yaws.conf.sample
-lib/yaws/ebin/mime_type_c.beam
-lib/yaws/ebin/mime_types.beam
-lib/yaws/ebin/yaws.app
-lib/yaws/ebin/yaws.beam
-lib/yaws/ebin/yaws_404.beam
-lib/yaws/ebin/yaws_api.beam
-lib/yaws/ebin/yaws_app.beam
-lib/yaws/ebin/yaws_cgi.beam
-lib/yaws/ebin/yaws_compile.beam
-lib/yaws/ebin/yaws_config.beam
-lib/yaws/ebin/yaws_ctl.beam
-lib/yaws/ebin/yaws_debug.beam
-lib/yaws/ebin/yaws_html.beam
-lib/yaws/ebin/yaws_log.beam
-lib/yaws/ebin/yaws_log_file_h.beam
-lib/yaws/ebin/yaws_ls.beam
-lib/yaws/ebin/yaws_revproxy.beam
-lib/yaws/ebin/yaws_server.beam
-lib/yaws/ebin/yaws_session_server.beam
-lib/yaws/ebin/yaws_ssl.beam
-lib/yaws/ebin/yaws_sup.beam
-lib/yaws/ebin/yaws_ticker.beam
-lib/yaws/ebin/yaws_vsn.beam
-lib/yaws/ebin/yaws_zlib.beam
-lib/yaws/include/yaws.hrl
-lib/yaws/include/yaws_api.hrl
-lib/yaws/priv/mime.types
-lib/yaws/priv/setuid_drv.so
+lib/erlang/lib/yaws-%%VERSION%%/ebin/mime_type_c.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/mime_types.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws.app
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_404.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_api.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_app.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_cgi.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_compile.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_config.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ctl.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_debug.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_html.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log_file_h.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ls.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_revproxy.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_server.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_session_server.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ssl.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ticker.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_vsn.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_zlib.beam
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws_api.hrl
+lib/erlang/lib/yaws-%%VERSION%%/priv/mime.types
+lib/erlang/lib/yaws-%%VERSION%%/priv/setuid_drv.so
 www/yaws/END
 www/yaws/EXHEAD
 www/yaws/HEAD
@@ -219,10 +219,10 @@ www/yaws/ybed.erl
 @dirrm www/yaws/icons/small
 @dirrm www/yaws/icons
 @dirrm www/yaws
-@dirrm lib/yaws/priv
-@dirrm lib/yaws/include
-@dirrm lib/yaws/ebin
-@dirrm lib/yaws
+@dirrm lib/erlang/lib/yaws-%%VERSION%%/priv
+@dirrm lib/erlang/lib/yaws-%%VERSION%%/include
+@dirrm lib/erlang/lib/yaws-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/yaws-%%VERSION%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p /var/log/yaws
 @unexec rmdir /var/log/yaws 2>/dev/null || true