Upgrade to Jungerl codebase (last commit on 04/10/2006).

3 files changed, 28 insertions, 42 deletions

diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index 09500345fa16..9c4319e3a67d 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	distel
-PORTVERSION=	3.3
-PORTREVISION=	5
+PORTVERSION=	2006.10.04
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://www.bluetail.com/%7Eluke/distel/:doc \
-		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR=	distel/:sf
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf ${DISTEL_MANUALS:S/$/:doc/}
+		${MASTER_SITE_LOCAL:S/$/:msl/}
+MASTER_SITE_SUBDIR=	olgeni/:msl
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:msl ${DISTEL_MANUALS:S/$/:doc/}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -23,24 +22,21 @@ BUILD_DEPENDS+=	erlc:${PORTSDIR}/lang/erlang
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-ALL_TARGET=	base
 USE_EMACS=	yes
 EMACS_PORT_NAME?=	emacs21
 
 DISTEL_MANUALS=	distel-euc.pdf distel-euc.ps.gz \
 		distel-user-3.3.pdf distel-user-3.3.ps.gz \
 		distel-3.1.pdf
-DISTEL_DOCS=	config/emacs-init-snippet.el AUTHORS ChangeLog NEWS README README.ie-session
+DISTEL_DOCS=	AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
 DISTEL_ROOT=	${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 
+do-build:
+	@cd ${WRKSRC} && erlc -W0 -o ebin/ +debug_info src/*.erl
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/c/dec32 ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/elisp/*el ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/elisp/*elc ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/elisp/*elc ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 	@${MKDIR} ${DOCSDIR}
 	@for FILE in ${DISTEL_DOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${DOCSDIR}; \
@@ -51,7 +47,7 @@ do-install:
 	@${MKDIR} ${DISTEL_ROOT}
 	@${MKDIR} ${DISTEL_ROOT}/src
 	@${MKDIR} ${DISTEL_ROOT}/ebin
-	@${INSTALL_DATA} ${WRKSRC}/erl/*.erl ${DISTEL_ROOT}/src
+	@${INSTALL_DATA} ${WRKSRC}/src/*.erl ${DISTEL_ROOT}/src
 	@${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${DISTEL_ROOT}/ebin
 	@${LN} -sf ${DISTNAME} ${PREFIX}/lib/erlang/lib/${PORTNAME}
 
diff --git a/devel/distel/distinfo b/devel/distel/distinfo
index 0d23e34e6689..c468cf3b1c00 100644
--- a/devel/distel/distinfo
+++ b/devel/distel/distinfo
@@ -1,6 +1,6 @@
-MD5 (erlang/distel-3.3.tar.gz) = 2a6672c078dcae15573e259296f8a031
-SHA256 (erlang/distel-3.3.tar.gz) = 6610bb74549fedfab9046a695412fcac5101ce8c4cf0332f596f091584ff5b54
-SIZE (erlang/distel-3.3.tar.gz) = 112804
+MD5 (erlang/distel-2006.10.04.tar.gz) = 8efe4659dc5ab8fc878b5cd76c23832e
+SHA256 (erlang/distel-2006.10.04.tar.gz) = 6c7a44c9cf2076e61bca12d006503c57c76c743adf3a0803c75cf765027ec0d4
+SIZE (erlang/distel-2006.10.04.tar.gz) = 101533
 MD5 (erlang/distel-euc.pdf) = 576a2fcfa68c9a1b3411bc5c83010f79
 SHA256 (erlang/distel-euc.pdf) = f730edddc511cf59beb4261cc1d1e3575d5763db1853f18f2c156b38d97c2d9d
 SIZE (erlang/distel-euc.pdf) = 154855
diff --git a/devel/distel/pkg-plist b/devel/distel/pkg-plist
index 39a19ca3c20d..26e8ac15c503 100644
--- a/devel/distel/pkg-plist
+++ b/devel/distel/pkg-plist
@@ -1,31 +1,13 @@
-bin/dec32
-%%EMACS_SITE_LISPDIR%%/distel/derl.el
-%%EMACS_SITE_LISPDIR%%/distel/distel-ie.el
-%%EMACS_SITE_LISPDIR%%/distel/distel.el
-%%EMACS_SITE_LISPDIR%%/distel/edb.el
-%%EMACS_SITE_LISPDIR%%/distel/epmd.el
-%%EMACS_SITE_LISPDIR%%/distel/erl-example.el
-%%EMACS_SITE_LISPDIR%%/distel/erl-service.el
-%%EMACS_SITE_LISPDIR%%/distel/erl-test.el
-%%EMACS_SITE_LISPDIR%%/distel/erl.el
-%%EMACS_SITE_LISPDIR%%/distel/erlext.el
-%%EMACS_SITE_LISPDIR%%/distel/erlext.elc
-%%EMACS_SITE_LISPDIR%%/distel/ewoc.el
-%%EMACS_SITE_LISPDIR%%/distel/md5.el
-%%EMACS_SITE_LISPDIR%%/distel/net-fsm.el
-%%EMACS_SITE_LISPDIR%%/distel/patmatch.el
-lib/erlang/lib/distel-%%VERSION%%/ebin/dilber.beam
-lib/erlang/lib/distel-%%VERSION%%/ebin/dilber_servant.beam
 lib/erlang/lib/distel-%%VERSION%%/ebin/distel.beam
 lib/erlang/lib/distel-%%VERSION%%/ebin/distel_ie.beam
 lib/erlang/lib/distel-%%VERSION%%/ebin/fdoc.beam
-lib/erlang/lib/distel-%%VERSION%%/src/dilber.erl
-lib/erlang/lib/distel-%%VERSION%%/src/dilber_servant.erl
 lib/erlang/lib/distel-%%VERSION%%/src/distel.erl
 lib/erlang/lib/distel-%%VERSION%%/src/distel_ie.erl
 lib/erlang/lib/distel-%%VERSION%%/src/fdoc.erl
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/INSTALL.WIN32
 %%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.ie-session
@@ -34,11 +16,19 @@ lib/erlang/lib/distel-%%VERSION%%/src/fdoc.erl
 %%DOCSDIR%%/distel-euc.ps.gz
 %%DOCSDIR%%/distel-user-3.3.pdf
 %%DOCSDIR%%/distel-user-3.3.ps.gz
-%%DOCSDIR%%/emacs-init-snippet.el
-@dirrm %%EMACS_SITE_LISPDIR%%/distel
-@dirrm %%DOCSDIR%%
-@dirrm lib/erlang/lib/distel-%%VERSION%%/src
-@dirrm lib/erlang/lib/distel-%%VERSION%%/ebin
-@dirrm lib/erlang/lib/distel-%%VERSION%%
+%%EMACS_SITE_LISPDIR%%/distel/derl.el
+%%EMACS_SITE_LISPDIR%%/distel/distel-ie.el
+%%EMACS_SITE_LISPDIR%%/distel/distel.el
+%%EMACS_SITE_LISPDIR%%/distel/edb.el
+%%EMACS_SITE_LISPDIR%%/distel/epmd.el
+%%EMACS_SITE_LISPDIR%%/distel/erl-example.el
+%%EMACS_SITE_LISPDIR%%/distel/erl-service.el
+%%EMACS_SITE_LISPDIR%%/distel/erl-test.el
+%%EMACS_SITE_LISPDIR%%/distel/erl.el
+%%EMACS_SITE_LISPDIR%%/distel/erlext.el
+%%EMACS_SITE_LISPDIR%%/distel/ewoc.el
+%%EMACS_SITE_LISPDIR%%/distel/md5.el
+%%EMACS_SITE_LISPDIR%%/distel/net-fsm.el
+%%EMACS_SITE_LISPDIR%%/distel/patmatch.el
 @exec ln -sf distel-%%VERSION%% %D/lib/erlang/lib/distel
 @unexec rm -f %D/lib/erlang/lib/distel