9 files changed, 57 insertions, 118 deletions

diff --git a/MOVED b/MOVED
index 78d9bfe03d6c..243d54f089cd 100644
--- a/MOVED
+++ b/MOVED
@@ -3435,3 +3435,4 @@ security/nmapfe|security/zenmap|2008-03-14|Project renamed
 x11/hs-x11-extras-ghc||2008-03-14|Has expired: Use x11/hs-x11-ghc instead
 www/mod_dosevasise20||2008-03-14|Has expired: Use www/mod_evasive20 instead
 textproc/p5-Text-ParseWords||2008-03-16|Module included in core perl
+devel/hc12mem|/devel/hcs12mem|2008-03-17|Project renamed
diff --git a/devel/Makefile b/devel/Makefile
index 27ac769aeb93..3b79def84daa 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -454,7 +454,7 @@
     SUBDIR += hachoir-regex
     SUBDIR += happydoc
     SUBDIR += hapy
-    SUBDIR += hc12mem
+    SUBDIR += hcs12mem
     SUBDIR += hgsvn
     SUBDIR += highlighterkit
     SUBDIR += horde-chora
diff --git a/devel/hc12mem/Makefile b/devel/hc12mem/Makefile
deleted file mode 100644
index cbe52a5ea91c..000000000000
--- a/devel/hc12mem/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	hc12mem
-# Date created:				18 November 2005
-# Whom:					mk
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hc12mem
-PORTVERSION=	1.3.1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
-		http://cml.mfk.net.pl/hc12mem/
-MASTER_SITE_SUBDIR=	hc12mem/:sf
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf,DEFAULT
-
-MAINTAINER=	mk@capri.pl
-COMMENT=	HCS12 MCU tool: erase,read,write,protect,unprotect FLASH/EEPROM
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GETOPT_LONG=yes
-MANCOMPRESSED=	no
-USE_GCC=	3.4+
-
-MAN1=		hc12mem.1
-
-.include <bsd.port.mk>
diff --git a/devel/hc12mem/distinfo b/devel/hc12mem/distinfo
deleted file mode 100644
index 38d1ec856250..000000000000
--- a/devel/hc12mem/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (hc12mem-1.3.1.tar.gz) = 011dfe66294296e2682d0e2db24ee7b7
-SHA256 (hc12mem-1.3.1.tar.gz) = 50126ff010973d52990070d26b5c69b6f1e61871f9fb75c5f9abec3c6c6ce42f
-SIZE (hc12mem-1.3.1.tar.gz) = 196409
diff --git a/devel/hc12mem/pkg-descr b/devel/hc12mem/pkg-descr
deleted file mode 100644
index 92af9c8ea7f4..000000000000
--- a/devel/hc12mem/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-hc12mem is a command line tool for embedded microcontroller developers using
-Freescale's HCS12-family MCUs.
-It can:
-- erase/read/write/protect internal EEPROM memory
-- erase/read/write internal FLASH memory
-- protect/unprotect whole MCU
-
-Supported MCUs: almost every HCS12 derivative
-<MC9S12> A32, A64, A128, A256, A512, C32, C64, C96, C128,
-GC16, GC32, GC64, GC96, GC128, D32, D64, D128, D256, D512,
-E32, E64, E128, E256, H128, H256, UF32, NE64.
-
-Supported target connections:
-- BDM:
-  - Daniel Malik's TDBML (Turbo BDM Light) USB POD
-  - Kevin Ross's BDM12 POD
-  - Marek Peca's PODEX
-  - my own improved version of PODEX with firmware bugfixes
-- LRAE (Load RAM And Execute) serial bootloader
-  see Freescale's Application Note AN2546
-- Freescale's HCS12 MCU serial monitor
-  see Freescale's Application Note AN2548
-
-WWW: http://cml.mfk.net.pl/hc12mem
diff --git a/devel/hc12mem/pkg-plist b/devel/hc12mem/pkg-plist
deleted file mode 100644
index 94d272bf996a..000000000000
--- a/devel/hc12mem/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-bin/hc12mem
-%%DATADIR%%/mc9s12a128.dat
-%%DATADIR%%/mc9s12a256.dat
-%%DATADIR%%/mc9s12a32.dat
-%%DATADIR%%/mc9s12a512.dat
-%%DATADIR%%/mc9s12a64.dat
-%%DATADIR%%/mc9s12c128.dat
-%%DATADIR%%/mc9s12c32.dat
-%%DATADIR%%/mc9s12c64.dat
-%%DATADIR%%/mc9s12c96.dat
-%%DATADIR%%/mc9s12d128.dat
-%%DATADIR%%/mc9s12d256.dat
-%%DATADIR%%/mc9s12d32.dat
-%%DATADIR%%/mc9s12d512.dat
-%%DATADIR%%/mc9s12d64.dat
-%%DATADIR%%/mc9s12e128.dat
-%%DATADIR%%/mc9s12e256.dat
-%%DATADIR%%/mc9s12e32.dat
-%%DATADIR%%/mc9s12e64.dat
-%%DATADIR%%/mc9s12gc128.dat
-%%DATADIR%%/mc9s12gc16.dat
-%%DATADIR%%/mc9s12gc32.dat
-%%DATADIR%%/mc9s12gc64.dat
-%%DATADIR%%/mc9s12gc96.dat
-%%DATADIR%%/mc9s12h128.dat
-%%DATADIR%%/mc9s12h256.dat
-%%DATADIR%%/mc9s12ne64.dat
-%%DATADIR%%/mc9s12uf32.dat
-%%DATADIR%%/bdm.s19
-%%DATADIR%%/lrae.s19
-@dirrm %%DATADIR%%
diff --git a/devel/hcs12mem/Makefile b/devel/hcs12mem/Makefile
index cbe52a5ea91c..cdd951045803 100644
--- a/devel/hcs12mem/Makefile
+++ b/devel/hcs12mem/Makefile
@@ -5,23 +5,39 @@
 # $FreeBSD$
 #
 
-PORTNAME=	hc12mem
-PORTVERSION=	1.3.1
+PORTNAME=	hcs12mem
+PORTVERSION=	1.4.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
-		http://cml.mfk.net.pl/hc12mem/
-MASTER_SITE_SUBDIR=	hc12mem/:sf
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf,DEFAULT
+MASTER_SITES=	SF
 
 MAINTAINER=	mk@capri.pl
-COMMENT=	HCS12 MCU tool: erase,read,write,protect,unprotect FLASH/EEPROM
+COMMENT=	Software to manipulate EEPROM/FLASH memory
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GETOPT_LONG=yes
-MANCOMPRESSED=	no
-USE_GCC=	3.4+
+GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
+USE_GETOPT_LONG=	yes
+MANCOMPRESSED=		no
 
-MAN1=		hc12mem.1
+MAN1=		hcs12mem.1
+DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
+DATS=	mc9s12a32.dat mc9s12a64.dat mc9s12a128.dat \
+	mc9s12a256.dat mc9s12a512.dat mc9s12d32.dat \
+	mc9s12d64.dat mc9s12d128.dat mc9s12d256.dat \
+	mc9s12d512.dat mc9s12c32.dat mc9s12c64.dat \
+	mc9s12c96.dat mc9s12c128.dat mc9s12gc16.dat \
+	mc9s12gc32.dat mc9s12gc64.dat mc9s12gc96.dat \
+	mc9s12gc128.dat mc9s12e32.dat mc9s12e64.dat \
+	mc9s12e128.dat mc9s12e256.dat mc9s12h128.dat \
+	mc9s12h256.dat mc9s12ne64.dat mc9s12uf32.dat \
+	mc9s12xd256.dat mc9s12xd512.dat
 
+do-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+.endif
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${DATS:S,^,${WRKSRC}/target/,} ${DATADIR}/
+	@${INSTALL_MAN}	${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
 .include <bsd.port.mk>
diff --git a/devel/hcs12mem/distinfo b/devel/hcs12mem/distinfo
index 38d1ec856250..e0de89ff900b 100644
--- a/devel/hcs12mem/distinfo
+++ b/devel/hcs12mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (hc12mem-1.3.1.tar.gz) = 011dfe66294296e2682d0e2db24ee7b7
-SHA256 (hc12mem-1.3.1.tar.gz) = 50126ff010973d52990070d26b5c69b6f1e61871f9fb75c5f9abec3c6c6ce42f
-SIZE (hc12mem-1.3.1.tar.gz) = 196409
+MD5 (hcs12mem-1.4.1.tar.gz) = dad2fa7e710b2554cbe56e4f5fe94ca8
+SHA256 (hcs12mem-1.4.1.tar.gz) = 790e90a0a750659c975cb63eab16e3d56e1dc8e30f65c8078b1851b0f47dd848
+SIZE (hcs12mem-1.4.1.tar.gz) = 216805
diff --git a/devel/hcs12mem/pkg-plist b/devel/hcs12mem/pkg-plist
index 94d272bf996a..1d2acd1c2b2f 100644
--- a/devel/hcs12mem/pkg-plist
+++ b/devel/hcs12mem/pkg-plist
@@ -1,31 +1,38 @@
-bin/hc12mem
+bin/hcs12mem
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/mc9s12a32.dat
+%%DATADIR%%/mc9s12a64.dat
 %%DATADIR%%/mc9s12a128.dat
 %%DATADIR%%/mc9s12a256.dat
-%%DATADIR%%/mc9s12a32.dat
 %%DATADIR%%/mc9s12a512.dat
-%%DATADIR%%/mc9s12a64.dat
-%%DATADIR%%/mc9s12c128.dat
-%%DATADIR%%/mc9s12c32.dat
-%%DATADIR%%/mc9s12c64.dat
-%%DATADIR%%/mc9s12c96.dat
+%%DATADIR%%/mc9s12d32.dat
+%%DATADIR%%/mc9s12d64.dat
 %%DATADIR%%/mc9s12d128.dat
 %%DATADIR%%/mc9s12d256.dat
-%%DATADIR%%/mc9s12d32.dat
 %%DATADIR%%/mc9s12d512.dat
-%%DATADIR%%/mc9s12d64.dat
-%%DATADIR%%/mc9s12e128.dat
-%%DATADIR%%/mc9s12e256.dat
-%%DATADIR%%/mc9s12e32.dat
-%%DATADIR%%/mc9s12e64.dat
-%%DATADIR%%/mc9s12gc128.dat
+%%DATADIR%%/mc9s12c32.dat
+%%DATADIR%%/mc9s12c64.dat
+%%DATADIR%%/mc9s12c96.dat
+%%DATADIR%%/mc9s12c128.dat
 %%DATADIR%%/mc9s12gc16.dat
 %%DATADIR%%/mc9s12gc32.dat
 %%DATADIR%%/mc9s12gc64.dat
 %%DATADIR%%/mc9s12gc96.dat
+%%DATADIR%%/mc9s12gc128.dat
+%%DATADIR%%/mc9s12e32.dat
+%%DATADIR%%/mc9s12e64.dat
+%%DATADIR%%/mc9s12e128.dat
+%%DATADIR%%/mc9s12e256.dat
 %%DATADIR%%/mc9s12h128.dat
 %%DATADIR%%/mc9s12h256.dat
 %%DATADIR%%/mc9s12ne64.dat
 %%DATADIR%%/mc9s12uf32.dat
-%%DATADIR%%/bdm.s19
-%%DATADIR%%/lrae.s19
+%%DATADIR%%/mc9s12xd256.dat
+%%DATADIR%%/mc9s12xd512.dat
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%