aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/msp430-binutils/Makefile18
-rw-r--r--devel/msp430-binutils/distinfo4
-rw-r--r--devel/msp430-binutils/pkg-plist3
-rw-r--r--devel/msp430-gcc/Makefile12
-rw-r--r--devel/msp430-gdb/Makefile6
-rw-r--r--devel/msp430mcu/Makefile11
-rw-r--r--devel/msp430mcu/distinfo4
-rw-r--r--devel/msp430mcu/files/patch-scripts-install.sh25
8 files changed, 39 insertions, 44 deletions
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 4b6c5d2f3834..236e8f8bbde4 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= binutils
-PORTVERSION= ${BINUTILVERSION}.${MSPGCCVERSION}
-PORTREVISION= 2
+PORTVERSION= ${BINUTILVERSION}.${LTSVERSION}
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \
SF/mspgcc/mspgcc:mspgcc
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR= binutils/releases
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${BINUTILVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
+ mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${MSPGCCVERSION}
+PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
@@ -28,9 +28,9 @@ COMMENT= GNU binutils for TI's msp430 MCUs cross-development
LICENSE= GPLv3
BINUTILVERSION= 2.21.1
-MSPGCCVERSION= 20110716
+LTSVERSION= 20110716
PATCHVERSION= 20110716
-BUGS_FIXED= 3379341
+BUGS_FIXED= 3379341 3386145 3143071
LTS_PATCHES!= for bugid in ${BUGS_FIXED} ; do echo ${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}-sf$${bugid}.patch ; done
USE_BZIP2= yes
@@ -62,7 +62,7 @@ BINARIES= addr2line ar as c++filt elfedit gprof ld nm objcopy objdump \
ranlib readelf size strings strip
pre-patch:
- @cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${MSPGCCVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}.patch
+ @cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${LTSVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}.patch
pre-configure:
${CHMOD} 755 ${WRKSRC}/configure
@@ -73,4 +73,8 @@ post-install:
${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
.endfor
+add-plist-post:
+ @${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2> /dev/null || true" >> ${TMPPLIST}
+ @${ECHO_CMD} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
+
.include <bsd.port.mk>
diff --git a/devel/msp430-binutils/distinfo b/devel/msp430-binutils/distinfo
index f7335b2d6106..f851bafb1c72 100644
--- a/devel/msp430-binutils/distinfo
+++ b/devel/msp430-binutils/distinfo
@@ -4,3 +4,7 @@ SHA256 (mspgcc-20110716.tar.bz2) = 6e28c2f4976933fc2663751192bc365c68705071908c1
SIZE (mspgcc-20110716.tar.bz2) = 371880
SHA256 (msp430-binutils-2.21.1-20110716-sf3379341.patch) = a7555ec75f631e46ad12e70743e5a540792283820edf02dbe68f3c823772fd6d
SIZE (msp430-binutils-2.21.1-20110716-sf3379341.patch) = 688
+SHA256 (msp430-binutils-2.21.1-20110716-sf3386145.patch) = 15c349440b5fa2582422a659801a2f96d66eff230f924d7e4bb57b30df2bcd0a
+SIZE (msp430-binutils-2.21.1-20110716-sf3386145.patch) = 3308
+SHA256 (msp430-binutils-2.21.1-20110716-sf3143071.patch) = 1df8c88e34c5742f56dfb78708d1dacd523c4b1e6a8436bfb737f04b557ab1a5
+SIZE (msp430-binutils-2.21.1-20110716-sf3143071.patch) = 1005
diff --git a/devel/msp430-binutils/pkg-plist b/devel/msp430-binutils/pkg-plist
index cfd56c99b702..49558293c086 100644
--- a/devel/msp430-binutils/pkg-plist
+++ b/devel/msp430-binutils/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.11 2011-07-28 11:52:42 lev Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.12 2011-08-05 13:21:30 lev Exp $
bin/%%BINUTILS_TARG%%-addr2line
bin/%%BINUTILS_TARG%%-ar
bin/%%BINUTILS_TARG%%-as
@@ -39,4 +39,3 @@ bin/%%BINUTILS_TARG%%-strip
@dirrm %%BINUTILS_TARG%%/bin
@dirrm %%BINUTILS_TARG%%/lib/ldscripts
@dirrm %%BINUTILS_TARG%%/lib
-@dirrmtry %%BINUTILS_TARG%%/info
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index efb7857a84e9..21a976b4ecc6 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gcc
-PORTVERSION= ${GCCVERSION}.${MSPGCCVERSION}
+PORTVERSION= ${GCCVERSION}.${LTSVERSION}
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= devel
@@ -17,10 +17,10 @@ PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${GCCVERSION}
DISTFILES= ${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
${PORTNAME}-g++-${GCCVERSION}${EXTRACT_SUFX} \
- mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
+ mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${MSPGCCVERSION}
+PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
@@ -40,7 +40,7 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
CONFLICTS= msp430-gcc-3.*
GCCVERSION= 4.5.3
-MSPGCCVERSION= 20110716
+LTSVERSION= 20110716
PATCHVERSION= 20110706
BUGS_FIXED= 3370978
LTS_PATCHES!= for bugid in ${BUGS_FIXED} ; do echo ${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}-sf$${bugid}.patch ; done
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=--target=${PKGNAMEPREFIX:S/-$//} \
--with-gmp=${LOCALBASE} --with-mpfr=${LOCALBASE} \
--with-mpc=${LOCALBASE} --with-libiconv-prefix=${LOCALBASE} \
--with-system-zlib --disable-nls \
- --with-pkgversion="MSPGCC_${MSPGCCVERSION}"
+ --with-pkgversion="MSPGCC_${LTSVERSION}"
INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
MAN1= ${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 \
@@ -80,7 +80,7 @@ BINARIES= gcc gcc-${GCCVERSION} c++ g++ gcov cpp
.include <bsd.port.pre.mk>
pre-patch:
- @cd ${SRCDIR} && ${PATCH} -s -p1 < ../mspgcc-${MSPGCCVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}.patch
+ @cd ${SRCDIR} && ${PATCH} -s -p1 < ../mspgcc-${LTSVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}.patch
pre-configure:
cd ${SRCDIR} ; contrib/gcc_update --touch
diff --git a/devel/msp430-gdb/Makefile b/devel/msp430-gdb/Makefile
index 3c8d7b487e43..2292cd603fad 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${GDBVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
+ mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
MAINTAINER= lev@FreeBSD.org
COMMENT= FSF GDB for TI's msp430 MCUs cross-development
@@ -22,7 +22,7 @@ COMMENT= FSF GDB for TI's msp430 MCUs cross-development
LICENSE= GPLv3
GDBVERSION= 7.2
-MSPGCCVERSION= 20110716
+LTSVERSION= 20110716
PATCHVERSION= 20110103
WRKSRC= ${WRKDIR}/${PORTNAME}-${GDBVERSION}
@@ -43,7 +43,7 @@ MANPAGES= gdb.1:gdb run.1:sim/common
.include <bsd.port.pre.mk>
pre-patch:
- @cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${MSPGCCVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GDBVERSION}-${PATCHVERSION}.patch
+ @cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${LTSVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GDBVERSION}-${PATCHVERSION}.patch
do-install:
@${MKDIR} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin
diff --git a/devel/msp430mcu/Makefile b/devel/msp430mcu/Makefile
index b5f826db1ebc..e6fe58a3992b 100644
--- a/devel/msp430mcu/Makefile
+++ b/devel/msp430mcu/Makefile
@@ -7,16 +7,24 @@
PORTNAME= ${MCUTARGET}mcu
PORTVERSION= 1.0.${MCUVERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/mspgcc/${PORTNAME}
DISTNAME= ${PORTNAME}-${MCUVERSION}
+PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
+PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCHFILES= ${LTS_PATCHES}
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= lev@FreeBSD.org
COMMENT= Header files for TI's msp430 MCUs cross-development
+LTSVERSION= 20110716
MCUVERSION= 20110613
MCUTARGET= msp430
+BUGS_FIXED= 3379189 3384550
+LTS_PATCHES!= for bugid in ${BUGS_FIXED} ; do echo ${PORTNAME}-${MCUVERSION}-sf$${bugid}.patch ; done
USE_BZIP2= yes
NO_BUILD= yes
@@ -36,6 +44,7 @@ pre-install:
@${ECHO} "@dirrmtry ${MCUINCPATH}" >> ${PLIST}
@${ECHO} "@dirrmtry ${MCULIBPATH}/ldscripts" >> ${PLIST}
@${ECHO} "@dirrmtry ${MCULIBPATH}" >> ${PLIST}
+ @${ECHO} "@dirrmtry ${MCUTARGET}" >> ${PLIST}
do-install:
@cd ${WRKSRC} && MSP430MCU_ROOT=${WRKSRC} ${SH} scripts/install.sh ${PREFIX}
diff --git a/devel/msp430mcu/distinfo b/devel/msp430mcu/distinfo
index 7bbc9a55852b..6c8453e01eb4 100644
--- a/devel/msp430mcu/distinfo
+++ b/devel/msp430mcu/distinfo
@@ -1,2 +1,6 @@
SHA256 (msp430mcu-20110613.tar.bz2) = 954abc20d3997c8b6f63abcd7c683034b26435c537c0aa086c94e13d95e1b004
SIZE (msp430mcu-20110613.tar.bz2) = 3014406
+SHA256 (msp430mcu-20110613-sf3379189.patch) = 002e6270f0946ae6b4384b7aded796e5bdc66a84c6b50dfba41cccd9527e8650
+SIZE (msp430mcu-20110613-sf3379189.patch) = 1242
+SHA256 (msp430mcu-20110613-sf3384550.patch) = f86d961aacfdff966905e7747d974e479f3951a97bce75e7217bca151234bfc7
+SIZE (msp430mcu-20110613-sf3384550.patch) = 3979
diff --git a/devel/msp430mcu/files/patch-scripts-install.sh b/devel/msp430mcu/files/patch-scripts-install.sh
deleted file mode 100644
index eea982aeb29d..000000000000
--- a/devel/msp430mcu/files/patch-scripts-install.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/scripts/install.sh b/scripts/install.sh
-index 3d71e63..2a40727 100755
---- scripts/install.sh.orig
-+++ scripts/install.sh
-@@ -15,16 +15,16 @@ LIBPATH=${PREFIX}/msp430/lib
- mkdir -p ${INCPATH} ${LIBPATH}
-
- # Upstream headers
--install -p ${UPSTREAM}/*.h ${INCPATH}
-+install -m 0644 -p ${UPSTREAM}/*.h ${INCPATH}
-
- # Local override headers
--install -p ${MSP430MCU_ROOT}/include/*.h ${INCPATH}
-+install -m 0644 -p ${MSP430MCU_ROOT}/include/*.h ${INCPATH}
-
- # Override msp430.h to accommodate legacy MSPGCC MCU identifiers
--install -p ${ANALYSIS}/msp430.h ${INCPATH}
-+install -m 0644 -p ${ANALYSIS}/msp430.h ${INCPATH}
-
- # MCU-specific data for GCC driver program
--install -p ${ANALYSIS}/msp430mcu.spec ${LIBPATH}
-+install -m 0644 -p ${ANALYSIS}/msp430mcu.spec ${LIBPATH}
-
- # Install MCU-specific memory and periph maps
- cp -pr ${ANALYSIS}/ldscripts ${LIBPATH}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 19:59:04 +0000