- Sync with lang/sdcc.

- Replace NO_LATEST_LINK with PKGNAMESUFFIX to accomodate pkg.
- Update to 3.3.1.2013.09.07 which brings experimental support for
  STMicroelectronics STM8.

lang/sdcc-devel/Makefile

@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	sdcc
-PORTVERSION=	3.2.1.2013.03.22
+PORTVERSION=	3.3.1.2013.09.07
 CATEGORIES=	lang
 MASTER_SITES=	SF/sdcc/snapshot_builds/sdcc-src/ \
 		http://tijl.fastmail.fm/mirror/
-DISTNAME=	${PORTNAME}-src-20130322-8457
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-src-20130907-8835
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Small Device C Compiler
@@ -17,80 +18,53 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:${PORTSDIR}/d
 CONFLICTS_INSTALL=	sdcc-[0-9]*
 DESCR=		${PORTSDIR}/lang/sdcc/pkg-descr
 GNU_CONFIGURE=	yes
-NO_LATEST_LINK=	yes
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 
-OPTIONS_DEFINE= DEVLIB DOCS HC08 MCS51 PIC UCSIM Z80
-OPTIONS_DEFAULT=${OPTIONS_DEFINE:NDOCS}
+OPTIONS_DEFINE= 	DEVLIB DOCS UCSIM
+OPTIONS_MULTI=		TARGETS
+OPTIONS_MULTI_TARGETS=	HC08 MCS51 PIC STM8 Z80
+OPTIONS_DEFAULT=	DEVLIB UCSIM HC08 MCS51 PIC STM8 Z80
 DEVLIB_DESC=	Device libraries
 HC08_DESC=	Freescale 68HC08/S08
 MCS51_DESC=	Intel MCS51, Maxim DS80C390/DS80C400
 PIC_DESC=	Microchip PIC
 UCSIM_DESC=	The ucSim simulator
+STM8_DESC=	STMicroelectronics STM8
 Z80_DESC=	Zilog Z80/Z180/GBZ80, Rabbit 2000/3000/3000A
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-idirafter ${LOCALBASE}/include
 CONFIGURE_ARGS= --disable-avr --disable-install-libbfd --disable-werror \
-		--enable-new-pics
+		--disable-st7 docdir=${DOCSDIR}
 CONFIGURE_ENV=	ARCH=""
+PORTDATA=	*
+PORTDOCS=	*
 WRKSRC= 	${WRKDIR}/sdcc
 
+OPTIONS_SUB=		yes
+DEVLIB_CONFIGURE_OFF=	--disable-device-lib
+HC08_CONFIGURE_OFF=	--disable-hc08 --disable-hc08-port		\
+			--disable-s08-port
+MCS51_CONFIGURE_OFF=	--disable-51 --disable-mcs51-port		\
+			--disable-ds390-port --disable-ds400-port
+PIC_BUILD_DEPENDS=	gputils>=1.0.0:${PORTSDIR}/devel/gputils
+PIC_RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
+PIC_CONFIGURE_OFF=	--disable-pic14-port --disable-pic16-port
+STM8_CONFIGURE_OFF=	--disable-stm8 --disable-stm8-port
+UCSIM_CONFIGURE_OFF=	--disable-ucsim
+Z80_CONFIGURE_OFF=	--disable-z80 --disable-z80-port		\
+			--disable-z180-port --disable-gbz80-port	\
+			--disable-r2k-port --disable-r3ka-port
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
-.if ${PORT_OPTIONS:MDEVLIB}
-PLIST_SUB+=	DEVLIB=""
-.else
-CONFIGURE_ARGS+=--disable-device-lib
-PLIST_SUB+=	DEVLIB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MHC08}
-PLIST_SUB+=	HC08=""
-.else
-CONFIGURE_ARGS+=--disable-hc08 --disable-hc08-port --disable-s08-port
-PLIST_SUB+=	HC08="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMCS51}
-PLIST_SUB+=	MCS51=""
-.else
-CONFIGURE_ARGS+=--disable-51 --disable-mcs51-port \
-		--disable-ds390-port --disable-ds400-port
-PLIST_SUB+=	MCS51="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPIC}
-BUILD_DEPENDS+= gputils>=1.0.0:${PORTSDIR}/devel/gputils
-RUN_DEPENDS+=	gpasm:${PORTSDIR}/devel/gputils
-PLIST_SUB+=	PIC=""
-.else
-CONFIGURE_ARGS+=--disable-pic14-port --disable-pic16-port
-PLIST_SUB+=	PIC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MUCSIM}
-PLIST_SUB+=	UCSIM=""
-.else
-CONFIGURE_ARGS+=--disable-ucsim
-PLIST_SUB+=	UCSIM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MZ80}
-PLIST_SUB+=	Z80=""
-.else
-CONFIGURE_ARGS+=--disable-z80 --disable-z80-port --disable-z180-port \
-		--disable-gbz80-port --disable-r2k-port --disable-r3ka-port
-PLIST_SUB+=	Z80="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} '/install:/s/:.*/:/' \
+		${WRKSRC}/Makefile.in \
 		${WRKSRC}/support/sdbinutils/libiberty/Makefile.in
 .if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} 's, [a-z-]*doc,,' \
@@ -98,4 +72,7 @@ post-patch:
 		${WRKSRC}/sim/ucsim/packages_in.mk
 .endif
 
+post-install:
+	${FIND} -d ${DATADIR} -type d -empty -delete
+
 .include <bsd.port.post.mk>

lang/sdcc-devel/distinfo

@@ -1,2 +1,2 @@
-SHA256 (sdcc-src-20130322-8457.tar.bz2) = a3cc9914a3fb23f7fb31b7c023517e2206a120165561ed258371da2e0c7a27cd
-SIZE (sdcc-src-20130322-8457.tar.bz2) = 9954544
+SHA256 (sdcc-src-20130907-8835.tar.bz2) = 9a20ce2158447bceba0d677ecad2d259721fd4bea80d244f81251eeda6023af6
+SIZE (sdcc-src-20130907-8835.tar.bz2) = 10060715

lang/sdcc-devel/files/patch-device-lib-Makefile.in

@@ -1,16 +1,17 @@
---- device/lib/Makefile.in.orig	2012-05-18 18:09:24.000000000 +0200
-+++ device/lib/Makefile.in	2012-07-15 17:05:35.000000000 +0200
-@@ -485,26 +485,6 @@
+--- device/lib/Makefile.in.orig
++++ device/lib/Makefile.in
+@@ -501,27 +501,6 @@
  # ---------------------------------------------------
  install: all installdirs
  	[ ! -d "$(BUILDDIR)" ] || $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
 -	$(CP_U) -r $(MODELS) $(srcdir)/mcs51 $(srcdir)/ds390 $(srcdir)/ds400 \
 -	                     $(srcdir)/z80 $(srcdir)/z180 $(srcdir)/r2k $(srcdir)/r3ka $(srcdir)/gbz80 \
 -                         $(srcdir)/hc08 $(srcdir)/s08 \
+-                         $(srcdir)/stm8 \
 -	                     $(srcdir)/pic14 $(srcdir)/pic16 $(srcdir)/*.c $(sdcc_libdir)/src
--	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 r2k r3ka gbz80 hc08 s08 $(sdcc_libdir)/src
+-	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 r2k r3ka gbz80 hc08 s08 stm8 $(sdcc_libdir)/src
 -
--	for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka gbz80 hc08 s08 pic14 pic16; do \
+-	for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka gbz80 hc08 s08 stm8 pic14 pic16; do \
 -	  find $(sdcc_libdir)/src/$$src -depth \
 -	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
@@ -27,7 +28,7 @@
  
  # Deleting all the installed files
  # --------------------------------
-@@ -524,13 +504,7 @@
+@@ -541,13 +520,7 @@
  # Creating installation directories
  # ---------------------------------
  installdirs: