diff options
-rw-r--r-- | devel/byacc/Makefile | 2 | ||||
-rw-r--r-- | devel/libc++/Makefile | 3 | ||||
-rw-r--r-- | devel/ncurses/Makefile | 2 | ||||
-rw-r--r-- | devel/pkgconf/Makefile | 2 | ||||
-rw-r--r-- | shells/zsh/Makefile | 9 | ||||
-rw-r--r-- | shells/zsh/pkg-plist | 78 | ||||
-rw-r--r-- | www/cblog/Makefile | 2 | ||||
-rw-r--r-- | www/cplanet/Makefile | 2 |
8 files changed, 46 insertions, 54 deletions
diff --git a/devel/byacc/Makefile b/devel/byacc/Makefile index 71b1e9293705..71b1eadda6bb 100644 --- a/devel/byacc/Makefile +++ b/devel/byacc/Makefile @@ -4,11 +4,11 @@ PORTNAME= byacc PORTVERSION= 20140101 CATEGORIES= devel MASTER_SITES= ftp://invisible-island.net/${PORTNAME}/ -EXTRACT_SUFX= .tgz MAINTAINER= bapt@FreeBSD.org COMMENT= Best yacc variant available +USES= tar:tgz GNU_CONFIGURE= yes MAKEFILE= makefile diff --git a/devel/libc++/Makefile b/devel/libc++/Makefile index 7510ec53266a..7f76f6fbff8b 100644 --- a/devel/libc++/Makefile +++ b/devel/libc++/Makefile @@ -16,8 +16,7 @@ LICENSE_GROUP= MIT UIUC LICENSE_NAME_UIUC= University of Illinois/NCSA Open Source License LICENSE_PERMS_UIUC= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USE_XZ= yes -USES= cmake:outsource compiler:c++11-lang +USES= cmake:outsource compiler:c++11-lang tar:xz USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 048f769fbd31..bbc00d52aa4d 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -7,7 +7,6 @@ CATEGORIES= devel MASTER_SITES= ftp://invisible-island.net/${PORTNAME}/current/ MASTER_SITE_SUBDIR= ${PORTNAME}/current DIST_SUBDIR= ${PORTNAME} -EXTRACT_SUFX= .tgz MAINTAINER= bapt@FreeBSD.org COMMENT= Library for terminal-independent, full-screen output @@ -18,6 +17,7 @@ LICENSE= MIT RELEASE= 5.9 +USES= tar:tgz GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index bd2cbb8df44c..de17683d30b3 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -11,11 +11,11 @@ COMMENT= Utility to help to configure compiler and linker flags LICENSE= ISCL +USES= tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig:/usr/libdata/pkgconfig \ --with-system-libdir=/usr/lib \ --with-system-includedir=/usr/include -USE_BZIP2= yes MAKE_ARGS= MANDIR="${MAN1PREFIX}/man/man1" CONFLICTS_INSTALL= pkg-config-* diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 9c3c7e5281e4..14c5935492e9 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -20,8 +20,7 @@ MAKE_JOBS_UNSAFE= yes ZSH_VER= ${PORTVERSION} -USE_BZIP2= yes -USES= iconv ncurses +USES= iconv ncurses tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -67,12 +66,6 @@ MULTIBYTE_CONFIGURE_ENABLE= multibyte .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MSTATIC} -PLIST_SUB+= SHARED="@comment " -.else -PLIST_SUB+= SHARED="" -.endif - .if ${PORT_OPTIONS:MDOCS} INFO= zsh .endif diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist index 41ee21f12661..ce61923d4ddb 100644 --- a/shells/zsh/pkg-plist +++ b/shells/zsh/pkg-plist @@ -5,45 +5,45 @@ bin/rzsh @exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak @unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak bin/zsh-%%ZSH_VER%% -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/cap.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/clone.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/compctl.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/complete.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/complist.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/computil.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/curses.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so -%%GDBM%%%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/db/gdbm.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/example.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/files.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/langinfo.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/mapfile.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/mathfunc.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/net/socket.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/net/tcp.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so -%%PCRE%%%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/regex.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/sched.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/stat.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/system.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/termcap.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/terminfo.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zftp.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zle.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zleparameter.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zprof.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zpty.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zselect.so -%%SHARED%%lib/zsh/%%ZSH_VER%%/zsh/zutil.so -%%GDBM%%%%SHARED%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/db -%%SHARED%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/net -%%SHARED%%@dirrm lib/zsh/%%ZSH_VER%%/zsh -%%SHARED%%@dirrm lib/zsh/%%ZSH_VER%% -%%SHARED%%@dirrm lib/zsh +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/compctl.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/curses.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so +%%GDBM%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/db/gdbm.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/files.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/langinfo.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mapfile.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mathfunc.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/socket.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/tcp.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so +%%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/regex.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/system.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/termcap.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/terminfo.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zftp.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zle.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zleparameter.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zprof.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zpty.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zselect.so +%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zutil.so +%%GDBM%%%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/db +%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/net +%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh +%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%% +%%NO_STATIC%%@dirrm lib/zsh @exec mkdir -p %D/%%DATADIR%%/site-functions 2> /dev/null || true @dirrmtry %%DATADIR%%/site-functions %%DATADIR%%/%%ZSH_VER%%/functions/Calendar.zwc diff --git a/www/cblog/Makefile b/www/cblog/Makefile index 44c088663964..015afae344a3 100644 --- a/www/cblog/Makefile +++ b/www/cblog/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver LIB_DEPENDS= libfcgi.so:${PORTSDIR}/www/fcgi \ libcdb.so:${PORTSDIR}/databases/tinycdb -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_RC_SUBR= cblog diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile index 8311bdc1e755..b540cb8e02bf 100644 --- a/www/cplanet/Makefile +++ b/www/cplanet/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libneo_cs.a:${PORTSDIR}/www/clearsilver LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libcurl.so:${PORTSDIR}/ftp/curl -LICENSE= BSD +LICENSE= BSD2CLAUSE OPTIONS_DEFINE= EXAMPLES |