Index: head/lang/sdcc/Makefile =================================================================== --- head/lang/sdcc/Makefile (revision 390648) +++ head/lang/sdcc/Makefile (revision 390649) @@ -1,75 +1,74 @@ # $FreeBSD$ PORTNAME= sdcc -PORTVERSION= 3.4.0 +PORTVERSION= 3.5.0 DISTVERSIONPREFIX= src- CATEGORIES= lang MASTER_SITES= SF MAINTAINER= tijl@FreeBSD.org COMMENT= Small Device C Compiler LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/adjacency_list.hpp:${PORTSDIR}/devel/boost-libs CONFLICTS_INSTALL= sdcc-[0-9]* sdcc-devel-[0-9]* GNU_CONFIGURE= yes -USES= gmake tar:bzip2 +USES= gmake readline:port tar:bzip2 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 +UCSIM_DESC= The ucSim simulator Z80_DESC= Zilog Z80/Z180/GBZ80, Rabbit 2000/3000, Toshiba TLCS-90 -CPPFLAGS+= -idirafter ${LOCALBASE}/include CONFIGURE_ARGS= --disable-avr --disable-install-libbfd --disable-werror \ --disable-st7 docdir=${DOCSDIR} sdcc_cv_c_fms_extensions=no CONFIGURE_ENV= ARCH="" PORTDATA= * PORTDOCS= * WRKSRC= ${WRKDIR}/sdcc-${DISTVERSION} 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.2.0:${PORTSDIR}/devel/gputils PIC_RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils PIC_CONFIGURE_OFF= --disable-pic14-port --disable-pic16-port -UCSIM_CONFIGURE_OFF= --disable-ucsim 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 \ --disable-tlcs90-port .include .if ${ARCH} == "amd64" -CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} +CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif post-patch: @${REINPLACE_CMD} '/install:/s/:.*/:/' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/support/sdbinutils/libiberty/Makefile.in .if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} 's, [a-z-]*doc,,' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/sim/ucsim/packages_in.mk .endif post-install: ${FIND} -d ${STAGEDIR}${DATADIR} -type d -empty -delete .include Index: head/lang/sdcc/distinfo =================================================================== --- head/lang/sdcc/distinfo (revision 390648) +++ head/lang/sdcc/distinfo (revision 390649) @@ -1,2 +1,2 @@ -SHA256 (sdcc-src-3.4.0.tar.bz2) = cf6af862b94d5f259f11afa0a1b86304f3047b3723a9df96f20dba869deb5bf9 -SIZE (sdcc-src-3.4.0.tar.bz2) = 10249599 +SHA256 (sdcc-src-3.5.0.tar.bz2) = f82978d1614244b22e093402c0a4de1f688a07c807b2980126c964eb3df85fa9 +SIZE (sdcc-src-3.5.0.tar.bz2) = 10504517 Index: head/lang/sdcc/files/patch-device-lib-Makefile.in =================================================================== --- head/lang/sdcc/files/patch-device-lib-Makefile.in (revision 390648) +++ head/lang/sdcc/files/patch-device-lib-Makefile.in (revision 390649) @@ -1,45 +1,45 @@ ---- device/lib/Makefile.in.orig +--- device/lib/Makefile.in.orig 2015-04-15 16:44:20 UTC +++ device/lib/Makefile.in -@@ -501,27 +501,6 @@ +@@ -513,27 +513,6 @@ clean_intermediate-pic14: # --------------------------------------------------- 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)/tlcs90 $(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 tlcs90 gbz80 hc08 s08 stm8 $(sdcc_libdir)/src - - for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka tlcs90 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 \ - -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \ - -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \ - -name 'bootstrap.sh' \) \ - -exec rm -rf {} + ; \ - done - find $(sdcc_libdir)/src/mcs51 -depth \ - \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \ - -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \ - -name 'Makefile*' \) \ - -exec rm -rf {} + # Deleting all the installed files # -------------------------------- -@@ -541,13 +520,7 @@ +@@ -553,13 +532,7 @@ installcheck: # Creating installation directories # --------------------------------- installdirs: - for model in $(MODELS); do \ - mkdir -p $(sdcc_libdir)/$$model; \ - done - for libdir in small-stack-auto ds390 ds400 hc08 s08 pic16 pic14; do \ - mkdir -p $(sdcc_libdir)/$$libdir; \ - done - mkdir -p $(sdcc_libdir)/src + mkdir -p $(sdcc_libdir) # Creating dependencies # --------------------- Index: head/lang/sdcc/files/patch-device-non-free-lib-Makefile.in =================================================================== --- head/lang/sdcc/files/patch-device-non-free-lib-Makefile.in (revision 390648) +++ head/lang/sdcc/files/patch-device-non-free-lib-Makefile.in (revision 390649) @@ -1,32 +1,32 @@ ---- device/non-free/lib/Makefile.in.orig +--- device/non-free/lib/Makefile.in.orig 2015-03-26 13:21:24 UTC +++ device/non-free/lib/Makefile.in -@@ -397,17 +397,6 @@ - # --------------------------------------------------- +@@ -353,17 +353,6 @@ clean_intermediate-pic14: install: all installdirs + ifneq ($(TARGETS), ) [ ! -d "$(BUILDDIR)" ] || $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir) -- $(CP_U) -r $(srcdir)/pic14 $(srcdir)/pic16 $(sdcc_libdir)/src +- $(CP_U) -r $(foreach p, $(ENABLED_PORTS), $(srcdir)/$(p)) $(sdcc_libdir)/src - -- for src in pic14 pic16; do \ +- for src in $(ENABLED_PORTS); 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 \ - -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \ - -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \ - -name 'bootstrap.sh' \) \ - -exec rm -rf {} + ; \ - done + endif # Deleting all the installed files - # -------------------------------- -@@ -427,10 +416,7 @@ - # Creating installation directories +@@ -385,10 +374,7 @@ installcheck: # --------------------------------- installdirs: -- for libdir in pic16 pic14; do \ + ifneq ($(TARGETS), ) +- for libdir in $(ENABLED_PORTS); do \ - mkdir -p $(sdcc_libdir)/$$libdir; \ - done - mkdir -p $(sdcc_libdir)/src + mkdir -p $(sdcc_libdir) + endif # Creating dependencies - # --------------------- Index: head/lang/sdcc/pkg-plist =================================================================== --- head/lang/sdcc/pkg-plist (revision 390648) +++ head/lang/sdcc/pkg-plist (revision 390649) @@ -1,29 +1,30 @@ bin/as2gbmap bin/makebin bin/packihx %%UCSIM%%%%MCS51%%bin/s51 bin/sdar %%MCS51%%bin/sdas390 %%HC08%%bin/sdas6808 %%MCS51%%bin/sdas8051 %%Z80%%bin/sdasgb %%Z80%%bin/sdasrab %%STM8%%bin/sdasstm8 %%Z80%%bin/sdastlcs90 %%Z80%%bin/sdasz80 bin/sdcc bin/sdcclib %%UCSIM%%%%MCS51%%bin/sdcdb %%UCSIM%%%%MCS51%%bin/sdcdb.el %%UCSIM%%%%MCS51%%bin/sdcdbsrc.el bin/sdcpp bin/sdld -bin/sdld6808 -bin/sdldgb -bin/sdldz80 +%%HC08%%bin/sdld6808 +%%Z80%%bin/sdldgb +%%STM8%%bin/sdldstm8 +%%Z80%%bin/sdldz80 bin/sdnm bin/sdobjcopy bin/sdranlib %%UCSIM%%%%HC08%%bin/shc08 %%UCSIM%%%%STM8%%bin/sstm8 %%UCSIM%%%%Z80%%bin/sz80