svn commit: r316359 - in head/www/yaws: . files

[Jimmy Olgeni]

Author: olgeni
Date: Tue Apr 23 14:53:51 2013
New Revision: 316359
URL: http://svnweb.freebsd.org/changeset/ports/316359

Log:
  Remove symbolic link from yaws-1.96 to yaws.
  
  It caused "rebar generate" invocations to fail when Yaws was included,
  due to duplicate application directories with the same version.
  
  Also, add devel to CATEGORIES.

Modified:
  head/www/yaws/Makefile
  head/www/yaws/files/patch-scripts__gen-yaws   (contents, props changed)
  head/www/yaws/pkg-plist

Modified: head/www/yaws/Makefile
==============================================================================
--- head/www/yaws/Makefile	Tue Apr 23 14:40:08 2013	(r316358)
+++ head/www/yaws/Makefile	Tue Apr 23 14:53:51 2013	(r316359)
@@ -2,7 +2,8 @@
 
 PORTNAME=	yaws
 PORTVERSION=	1.96
-CATEGORIES=	www
+PORTREVISION=	1
+CATEGORIES=	www devel
 MASTER_SITES=	http://yaws.hyber.org/download/
 
 MAINTAINER=	olgeni at FreeBSD.org
@@ -20,7 +21,7 @@ WRKSRC=		${WRKDIR}/yaws-${PORTVERSION}
 MAN1=		yaws.1
 MAN5=		yaws.conf.5 yaws_api.5 yaws_soap_lib.5
 
-APPDIR=${PREFIX}/lib/erlang/lib/yaws-${PORTVERSION}
+APPDIR=		${PREFIX}/lib/erlang/lib/yaws-${PORTVERSION}
 
 SUB_FILES=	pkg-message
 
@@ -34,7 +35,9 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|!!PREFIX!!|${PREFIX}|g' \
 		${WRKSRC}/man/yaws_api.5 ${WRKSRC}/man/yaws.conf.5 \
-		${WRKSRC}/README
+		${WRKSRC}/README ${WRKSRC}/scripts/gen-yaws
+	@${REINPLACE_CMD} -e 's|!!VERSION!!|${PORTVERSION}|g' \
+		${WRKSRC}/scripts/gen-yaws
 	@${FIND} ${WRKSRC} \( -name \*.orig -or -name \*.bak \) -delete
 
 do-install:
@@ -66,7 +69,6 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/man/*.5 ${MANPREFIX}/man/man5
 
 post-install:
-	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Modified: head/www/yaws/files/patch-scripts__gen-yaws
==============================================================================
--- head/www/yaws/files/patch-scripts__gen-yaws	Tue Apr 23 14:40:08 2013	(r316358)
+++ head/www/yaws/files/patch-scripts__gen-yaws	Tue Apr 23 14:53:51 2013	(r316359)
@@ -1,20 +1,14 @@
---- scripts/gen-yaws.ORIG	2012-06-24 15:27:11.000000000 +0900
-+++ scripts/gen-yaws	2012-06-24 15:33:26.000000000 +0900
-@@ -1,13 +1,15 @@
- #!/bin/sh
- 
-+# CAUTION: Modified for FreeBSD Port installation
-+# referring yawsdir in the installed yaws library
-+
- # Used by scripts/Makefile and scripts/rebar-pre-script to generate
- # the yaws execution script
+
+$FreeBSD$
+
+--- scripts/gen-yaws.orig
++++ scripts/gen-yaws
+@@ -5,7 +5,7 @@
  
  set -e
  
 -topdir=`cd .. && pwd`
++topdir=!!PREFIX!!/lib/erlang/lib/yaws-!!VERSION!!
  cat yaws.template | \
--    ./Subst %yawsdir% "${topdir}" | \
-+    ./Subst %yawsdir% "/usr/local/lib/erlang/lib/yaws" | \
+     ./Subst %yawsdir% "${topdir}" | \
      ./Subst %vardir% "${VARDIR}" | \
-     ./Subst %run_erl% "${ERLBINDIR}/run_erl" | \
-     ./Subst %to_erl% "${ERLBINDIR}/to_erl" | \

Modified: head/www/yaws/pkg-plist
==============================================================================
--- head/www/yaws/pkg-plist	Tue Apr 23 14:40:08 2013	(r316358)
+++ head/www/yaws/pkg-plist	Tue Apr 23 14:53:51 2013	(r316359)
@@ -378,5 +378,3 @@ bin/yaws
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%
 @dirrm %%ETCDIR%%
- at exec ln -sf yaws-%%VERSION%% %D/lib/erlang/lib/yaws
- at unexec rm -f %D/lib/erlang/lib/yaws