aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED7
-rw-r--r--databases/Makefile1
-rw-r--r--databases/memcachedb/Makefile31
-rw-r--r--databases/memcachedb/distinfo2
-rw-r--r--databases/memcachedb/files/memcachedb.in26
-rw-r--r--databases/memcachedb/pkg-descr8
-rw-r--r--databases/memcachedb/pkg-plist2
-rw-r--r--devel/Makefile1
-rw-r--r--devel/creduce/Makefile42
-rw-r--r--devel/creduce/distinfo2
-rw-r--r--devel/creduce/pkg-descr5
-rw-r--r--devel/creduce/pkg-plist14
-rw-r--r--games/Makefile1
-rw-r--r--games/djgame2/Makefile58
-rw-r--r--games/djgame2/distinfo2
-rw-r--r--games/djgame2/files/djgame2.desktop.in11
-rw-r--r--games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp10
-rw-r--r--games/djgame2/files/patch-Hall__Hall.pro10
-rw-r--r--games/djgame2/files/patch-Shisensho__src__DJGameRank.h10
-rw-r--r--games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp17
-rw-r--r--games/djgame2/files/startdjg.in13
-rw-r--r--games/djgame2/pkg-descr4
-rw-r--r--games/djgame2/pkg-plist411
-rw-r--r--lang/Makefile1
-rw-r--r--lang/clay/Makefile41
-rw-r--r--lang/clay/distinfo2
-rw-r--r--lang/clay/files/patch-llvm32508
-rw-r--r--lang/clay/pkg-descr6
-rw-r--r--lang/clay/pkg-plist352
-rw-r--r--ports-mgmt/Makefile1
-rw-r--r--ports-mgmt/pkg-plist/Makefile26
-rw-r--r--ports-mgmt/pkg-plist/distinfo2
-rw-r--r--ports-mgmt/pkg-plist/pkg-descr5
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/rubygem-hiera-json/Makefile23
-rw-r--r--sysutils/rubygem-hiera-json/distinfo2
-rw-r--r--sysutils/rubygem-hiera-json/pkg-descr3
-rw-r--r--sysutils/rubygem-hiera-puppet/Makefile26
-rw-r--r--sysutils/rubygem-hiera-puppet/distinfo2
-rw-r--r--sysutils/rubygem-hiera-puppet/pkg-descr9
40 files changed, 7 insertions, 1692 deletions
diff --git a/MOVED b/MOVED
index 24ac0f33fa5..5158f90c131 100644
--- a/MOVED
+++ b/MOVED
@@ -7305,3 +7305,10 @@ lang/ironpython||2014-11-29|Has expired: Broken for more than 6 months
www/dpsearch||2014-11-29|Has expired: Broken for more than 6 months
multimedia/y4mscaler||2014-11-29|Has expired: Broken for more than 6 months
devel/rubygem-dep_selector||2014-11-29|Has expired: Broken for more than 6 months
+ports-mgmt/pkg-plist||2014-12-01|Has expired: Generate incorrect plists
+sysutils/rubygem-hiera-puppet||2014-12-01|Has expired: Has been incorporated into hiera
+sysutils/rubygem-hiera-json||2014-12-01|Has expired: Has been incorporated into hiera
+databases/memcachedb||2014-12-01|Has expired: Depends on deprecated Berkeley DB version, needs porting to DB_SITE
+games/djgame2||2014-12-01|Has expired: Online servers gone, game is not playable
+devel/creduce||2014-12-01|Has expired: Unmaintained and depends on ancient LLVM 3.2
+lang/clay||2014-12-01|Has expired: No development since July 2013, depends on obsolete clang-3.2
diff --git a/databases/Makefile b/databases/Makefile
index af794633934..a2f249f7fb9 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -171,7 +171,6 @@
SUBDIR += mdbtools
SUBDIR += mdcached
SUBDIR += memcached
- SUBDIR += memcachedb
SUBDIR += memcacheq
SUBDIR += metakit
SUBDIR += monetdb
diff --git a/databases/memcachedb/Makefile b/databases/memcachedb/Makefile
deleted file mode 100644
index 0b14e00c1f4..00000000000
--- a/databases/memcachedb/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-# $FreeBSD$
-
-PORTNAME= memcachedb
-PORTVERSION= 1.2.0
-PORTREVISION= 4
-CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-
-MAINTAINER= k@stereochro.me
-COMMENT= Distributed storage system designed for persistence
-
-DEPRECATED= Depends on deprecated Berkeley DB version, needs porting to DB_SITE
-EXPIRATION_DATE=2014-11-30
-
-LICENSE= BSD3CLAUSE
-
-LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
-
-CFLAGS+= -I"${BDB_INCLUDE_DIR}"
-CONFIGURE_ARGS= --enable-threads --with-bdb="${LOCALBASE}" \
- --with-libevent="${LOCALBASE}"
-GNU_CONFIGURE= yes
-LDFLAGS+= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
-USE_BDB= 48
-USE_RC_SUBR= ${PORTNAME}
-
-post-install:
- ${MKDIR} ${STAGEDIR}/var/db/memcachedb
-
-.include <bsd.port.mk>
diff --git a/databases/memcachedb/distinfo b/databases/memcachedb/distinfo
deleted file mode 100644
index 7862f3318af..00000000000
--- a/databases/memcachedb/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (memcachedb-1.2.0.tar.gz) = 6eba6e5adda1bc23db6bbcf4930537ccdc33fa00402ed91157faadeb86996e0f
-SIZE (memcachedb-1.2.0.tar.gz) = 149236
diff --git a/databases/memcachedb/files/memcachedb.in b/databases/memcachedb/files/memcachedb.in
deleted file mode 100644
index 59e8ae1219e..00000000000
--- a/databases/memcachedb/files/memcachedb.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: memcachedb
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# memcachedb_enable (bool): Set to NO by default.
-# Set it to YES to enable memcachedb.
-#
-. /etc/rc.subr
-
-name="memcachedb"
-rcvar=memcachedb_enable
-
-load_rc_config $name
-
-command="%%PREFIX%%/bin/${name}"
-
-: ${memcachedb_flags="-p11211 -l 127.0.0.1 -d -u nobody -f /var/db/memcachedb/default.db -H /var/db/memcachedb -P /var/run/memcachedb.pid"}
-
-run_rc_command "$1"
-
diff --git a/databases/memcachedb/pkg-descr b/databases/memcachedb/pkg-descr
deleted file mode 100644
index 70d9e3ab4a2..00000000000
--- a/databases/memcachedb/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-MemcacheDB is a distributed storage system designed for persistence.
-It is not a cache solution, but a persistent storage engine for fast and
-reliable key-value based object storage and retrieval. It conforms to
-memcache protocol (not complete), so any memcached client can connect to
-it. MemcacheDB uses Berkeley DB as a storing backend, so lots of
-features including transaction and replication are supported.
-
-WWW: http://code.google.com/p/memcachedb/
diff --git a/databases/memcachedb/pkg-plist b/databases/memcachedb/pkg-plist
deleted file mode 100644
index 251783ad10c..00000000000
--- a/databases/memcachedb/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/memcachedb
-@dir(nobody,nobody,770) /var/db/memcachedb
diff --git a/devel/Makefile b/devel/Makefile
index eacfefb8642..2fd882de336 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -276,7 +276,6 @@
SUBDIR += cppunit
SUBDIR += cproto
SUBDIR += cpuflags
- SUBDIR += creduce
SUBDIR += critcl
SUBDIR += cross-binutils
SUBDIR += cscope
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile
deleted file mode 100644
index a9f46262588..00000000000
--- a/devel/creduce/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= creduce
-#PORTVERSION= 2.0.1
-DISTVERSION= 2.0.1
-PORTREVISION= 1
-CATEGORIES= devel
-#MASTER_SITES= http://embed.cs.utah.edu/creduce/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Produces small test cases
-
-DEPRECATED= Unmaintained and depends on ancient LLVM 3.2
-EXPIRATION_DATE= 2014-12-01
-
-# "University of Illinois Open Source License."
-#LICENSE= BSD2CLAUSE
-
-BUILD_DEPENDS= llvm-config32:${PORTSDIR}/lang/clang32
-RUN_DEPENDS= llvm-config32:${PORTSDIR}/lang/clang32 \
- topformflat:${PORTSDIR}/devel/delta \
- astyle:${PORTSDIR}/devel/astyle \
- p5-Benchmark-Timer>=0:${PORTSDIR}/devel/p5-Benchmark-Timer \
- p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
- p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
- p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
- devel/p5-Sys-Cpu>=0:${PORTSDIR}/devel/p5-Sys-Cpu
-
-USE_GITHUB= yes
-GH_ACCOUNT= csmith-project
-GH_TAGNAME= a2422d5
-GH_COMMIT= a2422d5
-
-GNU_CONFIGURE= yes
-CONFIGURE_FLAGS= --with-llvm=${LOCALBASE}
-
-USES= gmake perl5
-
-post-patch:
- ${REINPLACE_CMD} 's,llvm-config,llvm-config32,g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/devel/creduce/distinfo b/devel/creduce/distinfo
deleted file mode 100644
index 24b28502fa4..00000000000
--- a/devel/creduce/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (creduce-2.0.1.tar.gz) = 9190e639dfb496149436df877eb75530c524f016423977c10dfc3b245d6dd667
-SIZE (creduce-2.0.1.tar.gz) = 537273
diff --git a/devel/creduce/pkg-descr b/devel/creduce/pkg-descr
deleted file mode 100644
index 5c8eabf8297..00000000000
--- a/devel/creduce/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-C-Reduce is a tool which takes a large C or C++ program that has a property of
-interest (such as triggering a compiler bug) and automatically produces a much
-smaller C/C++ program that has the same property. It is intended for use by
-people who discover and report bugs in compilers and other tools that process
-C/C++ code.
diff --git a/devel/creduce/pkg-plist b/devel/creduce/pkg-plist
deleted file mode 100644
index e464439933f..00000000000
--- a/devel/creduce/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/creduce
-libexec/clang_delta
-%%DATADIR%%/perl/pass_balanced.pm
-%%DATADIR%%/perl/pass_lines.pm
-%%DATADIR%%/perl/pass_peep.pm
-%%DATADIR%%/perl/creduce_utils.pm
-%%DATADIR%%/perl/pass_indent.pm
-%%DATADIR%%/perl/creduce_regexes.pm
-%%DATADIR%%/perl/pass_blank.pm
-%%DATADIR%%/perl/creduce_config.pm
-%%DATADIR%%/perl/pass_crc.pm
-%%DATADIR%%/perl/pass_ints.pm
-%%DATADIR%%/perl/pass_clang.pm
-%%DATADIR%%/perl/pass_ternary.pm
diff --git a/games/Makefile b/games/Makefile
index 3333344292b..d3587022228 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -188,7 +188,6 @@
SUBDIR += defendguin
SUBDIR += diameter
SUBDIR += digger-vgl
- SUBDIR += djgame2
SUBDIR += dmjava
SUBDIR += dodgindiamond2
SUBDIR += domination
diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile
deleted file mode 100644
index 177bb08f714..00000000000
--- a/games/djgame2/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Created by: Yinghong Liu <relaxbsd@gmail.com>
-# $FreeBSD$
-
-PORTNAME= djgame2
-PORTVERSION= 3.2.0
-PORTREVISION= 4
-CATEGORIES= games
-MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
-DISTNAME= source-${PORTVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= bluedj contains many popular online games
-
-LICENSE= GPLv2 # or later
-LICENSE_FILE= ${WRKSRC}/LICENSE.GPL
-
-BROKEN= Online servers gone, game is not playable
-DEPRECATED= Online servers gone, game is not playable
-EXPIRATION_DATE=2014-12-01
-
-USE_QT4= gui qt3support qmake_build uic_build rcc_build moc_build svg
-USES= dos2unix zip
-DOS2UNIX_FILES= Base/src/DJGraphicsChessTimerItem.cpp
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-DATADIR= ${PREFIX}/share/djgame2
-
-SUB_FILES= djgame2.desktop startdjg
-
-post-patch:
- ${RM} -f ${WRKSRC}/Hall/HallRes/platform/x11/install
- @${REINPLACE_CMD} -e 's|linux/soundcard.h|sys/soundcard.h|g' \
- ${WRKSRC}/Base/src/PlayWave.cpp
- @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
- ${WRKSRC}/make_linux_output
- @${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
- -e 's|make$$|make -j${MAKE_JOBS_NUMBER}|' \
- ${WRKSRC}/make_linux_output
- @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \
- >> ${WRKSRC}/Base/Base.pro
- @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \
- >> ${WRKSRC}/Hall/Hall.pro
- @${CHMOD} a+x ${WRKSRC}/make_linux_output
-
-do-build:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make_linux_output
-
-do-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}
- (cd ${WRKSRC}/Hall/build; ${TAR} -cf - *) | \
- ${TAR} -xf - -C ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKDIR}/djgame2.desktop \
- ${STAGEDIR}${PREFIX}/share/applications
- ${INSTALL_SCRIPT} ${WRKDIR}/startdjg ${STAGEDIR}${PREFIX}/bin
- @(cd ${STAGEDIR}${DATADIR} && ${STRIP_CMD} modules/*.so Hall \
- UpdateHall libBase.so.1)
-
-.include <bsd.port.mk>
diff --git a/games/djgame2/distinfo b/games/djgame2/distinfo
deleted file mode 100644
index ccc0d05258b..00000000000
--- a/games/djgame2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (source-3.2.0.zip) = a75c6f82bcd5f16eaf3383b4657cbe9ff73bb44d80d39e0bd227de68a1070d14
-SIZE (source-3.2.0.zip) = 17825646
diff --git a/games/djgame2/files/djgame2.desktop.in b/games/djgame2/files/djgame2.desktop.in
deleted file mode 100644
index 3b7481501a8..00000000000
--- a/games/djgame2/files/djgame2.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=startdjg
-Icon=%%DATADIR%%/house.png
-Terminal=false
-Name=Bluedj II
-Name[zh_CN]= 蓝迪游戏 II
-Comment=Many popular online games
-Comment[zh_CN]=包含有许多在线游戏
-Type=Application
-Categories=GNOME;Application;Game;PuzzleGame;
diff --git a/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp b/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp
deleted file mode 100644
index 5323e0dbb67..00000000000
--- a/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Base/src/DJGraphicsChessTimerItem.cpp.orig 2013-12-27 20:08:04.531116404 +0100
-+++ ./Base/src/DJGraphicsChessTimerItem.cpp 2013-12-27 20:08:30.220122689 +0100
-@@ -19,6 +19,7 @@
- //Contact us at ggwizard@gmail.com or darkdong@gmail.com.
- //****************************************************************************/
-
-+#include <time.h>
- #include "DJGraphicsChessTimerItem.h"
- #include "DJGraphicsTextItem.h"
- #include "DJDesktop.h"
diff --git a/games/djgame2/files/patch-Hall__Hall.pro b/games/djgame2/files/patch-Hall__Hall.pro
deleted file mode 100644
index a9bbd12daf8..00000000000
--- a/games/djgame2/files/patch-Hall__Hall.pro
+++ /dev/null
@@ -1,10 +0,0 @@
---- Hall/Hall.pro.orig 2014-10-30 15:03:41.000000000 +0300
-+++ Hall/Hall.pro 2014-10-30 15:04:05.000000000 +0300
-@@ -13,6 +13,7 @@
- QT += network xml svg
-
- LIBS += ../Base/build/libBaseStatic.a
-+LIBS += -lX11
- #LIBS += ./libspeex.a
-
- INCLUDEPATH += ../Base/src include
diff --git a/games/djgame2/files/patch-Shisensho__src__DJGameRank.h b/games/djgame2/files/patch-Shisensho__src__DJGameRank.h
deleted file mode 100644
index 9303c98f73d..00000000000
--- a/games/djgame2/files/patch-Shisensho__src__DJGameRank.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Shisensho/src/DJGameRank.h.orig 2008-03-11 13:17:22.000000000 +0100
-+++ ./Shisensho/src/DJGameRank.h 2013-12-27 20:07:09.040179358 +0100
-@@ -22,6 +22,7 @@
- #ifndef DJGAMERANK_H
- #define DJGAMERANK_H
-
-+#include <time.h>
- #include "DJTreeWidget.h"
- #include "protocol.h"
-
diff --git a/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp b/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp
deleted file mode 100644
index e6e797e083e..00000000000
--- a/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./Shisensho/src/LLKPanelController.cpp.orig 2008-03-19 12:20:04.000000000 +0100
-+++ ./Shisensho/src/LLKPanelController.cpp 2013-12-27 20:07:09.043178203 +0100
-@@ -19,6 +19,7 @@
- //Contact us at ggwizard@gmail.com or darkdong@gmail.com.
- //****************************************************************************/
-
-+#include <time.h>
- #include "LLKPanelController.h"
- #include "LLKDesktopController.h"
- #include "DJGameController.h"
-@@ -61,4 +62,4 @@
- break;
- }
- DJPanelController::gameTrace(gameTrace);
--}
-\ No newline at end of file
-+}
diff --git a/games/djgame2/files/startdjg.in b/games/djgame2/files/startdjg.in
deleted file mode 100644
index b937976f0f6..00000000000
--- a/games/djgame2/files/startdjg.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-DATADIR=%%DATADIR%%
-if [ ! -d ~/djgame2 ]; then
- mkdir ~/djgame2
- mkdir ~/djgame2/chat
- cp -rp ${DATADIR}/* ~/djgame2
-fi
-
-cd ~/djgame2
-
-export LD_LIBRARY_PATH=./
-./Hall
diff --git a/games/djgame2/pkg-descr b/games/djgame2/pkg-descr
deleted file mode 100644
index 76f540ab3c8..00000000000
--- a/games/djgame2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-bluedj contains many popular online games in China, such as mahjong,
-poker and chess. It has a large number of games and game players.
-
-WWW: http://www.bluedj.com/
diff --git a/games/djgame2/pkg-plist b/games/djgame2/pkg-plist
deleted file mode 100644
index c0d7262600f..00000000000
--- a/games/djgame2/pkg-plist
+++ /dev/null
@@ -1,411 +0,0 @@
-bin/startdjg
-share/applications/djgame2.desktop
-%%DATADIR%%/libBase.so.1
-%%DATADIR%%/Hall
-%%DATADIR%%/logo.png
-%%DATADIR%%/Thumbs.db
-%%DATADIR%%/images/avatars/win5.gif
-%%DATADIR%%/images/avatars/angry.gif
-%%DATADIR%%/images/avatars/broadcast.gif
-%%DATADIR%%/images/avatars/clear.gif
-%%DATADIR%%/images/avatars/cry.gif
-%%DATADIR%%/images/avatars/egg.gif
-%%DATADIR%%/images/avatars/flower.gif
-%%DATADIR%%/images/avatars/happy.gif
-%%DATADIR%%/images/avatars/laugh.gif
-%%DATADIR%%/images/avatars/lose2.gif
-%%DATADIR%%/images/avatars/lucky.gif
-%%DATADIR%%/images/avatars/lucky_alt.gif
-%%DATADIR%%/images/avatars/sad.gif
-%%DATADIR%%/images/avatars/Thumbs.db
-%%DATADIR%%/images/avatars/win10.gif
-%%DATADIR%%/images/avatars/win2.gif
-%%DATADIR%%/images/avatars/angel.gif
-%%DATADIR%%/images/member/yowza.gif
-%%DATADIR%%/images/member/allgood.gif
-%%DATADIR%%/images/member/alligator.gif
-%%DATADIR%%/images/member/angel.gif
-%%DATADIR%%/images/member/angel2.gif
-%%DATADIR%%/images/member/aquarius.gif
-%%DATADIR%%/images/member/aries.gif
-%%DATADIR%%/images/member/astronaut.gif
-%%DATADIR%%/images/member/baby.gif
-%%DATADIR%%/images/member/badgift.gif
-%%DATADIR%%/images/member/barbell.gif
-%%DATADIR%%/images/member/baseball.gif
-%%DATADIR%%/images/member/basket1.gif
-%%DATADIR%%/images/member/basket2.gif
-%%DATADIR%%/images/member/basketball.gif
-%%DATADIR%%/images/member/bbq.gif
-%%DATADIR%%/images/member/beach.gif
-%%DATADIR%%/images/member/beautiful.gif
-%%DATADIR%%/images/member/beerclink.gif
-%%DATADIR%%/images/member/bemine.gif
-%%DATADIR%%/images/member/bighug.gif
-%%DATADIR%%/images/member/birdie.gif
-%%DATADIR%%/images/member/blah.gif
-%%DATADIR%%/images/member/bored.gif
-%%DATADIR%%/images/member/bravo.gif
-%%DATADIR%%/images/member/bride.gif
-%%DATADIR%%/images/member/brushing.gif
-%%DATADIR%%/images/member/bubblebath.gif
-%%DATADIR%%/images/member/bubblegum.gif
-%%DATADIR%%/images/member/bubbles.gif
-%%DATADIR%%/images/member/bulb.gif
-%%DATADIR%%/images/member/bundled.gif
-%%DATADIR%%/images/member/bunny.gif
-%%DATADIR%%/images/member/bunnyface.gif
-%%DATADIR%%/images/member/burningheart.gif
-%%DATADIR%%/images/member/caffeine.gif
-%%DATADIR%%/images/member/call.gif
-%%DATADIR%%/images/member/callme.gif
-%%DATADIR%%/images/member/callme2.gif
-%%DATADIR%%/images/member/campfire.gif
-%%DATADIR%%/images/member/cancer.gif
-%%DATADIR%%/images/member/capricorn.gif
-%%DATADIR%%/images/member/cheerleader.gif
-%%DATADIR%%/images/member/cheers.gif
-%%DATADIR%%/images/member/cigar.gif
-%%DATADIR%%/images/member/clapping.gif
-%%DATADIR%%/images/member/computer.gif
-%%DATADIR%%/images/member/computersmash.gif
-%%DATADIR%%/images/member/contacts.gif
-%%DATADIR%%/images/member/cool.gif
-%%DATADIR%%/images/member/cow.gif
-%%DATADIR%%/images/member/crabby.gif
-%%DATADIR%%/images/member/crossingguard.gif
-%%DATADIR%%/images/member/crying1.gif
-%%DATADIR%%/images/member/crying2.gif
-%%DATADIR%%/images/member/cupid.gif
-%%DATADIR%%/images/member/dating.gif
-%%DATADIR%%/images/member/dayenu.gif
-%%DATADIR%%/images/member/devil.gif
-%%DATADIR%%/images/member/dogyear.gif
-%%DATADIR%%/images/member/dolledup.gif
-%%DATADIR%%/images/member/dontknown.gif
-%%DATADIR%%/images/member/dragon.gif
-%%DATADIR%%/images/member/drinking.gif
-%%DATADIR%%/images/member/drinklaughing.gif
-%%DATADIR%%/images/member/dutch.gif
-%%DATADIR%%/images/member/earthday.gif
-%%DATADIR%%/images/member/easterbonnet.gif
-%%DATADIR%%/images/member/eletric.gif
-%%DATADIR%%/images/member/elephant.gif
-%%DATADIR%%/images/member/embarrassing.gif
-%%DATADIR%%/images/member/eyebrows.gif
-%%DATADIR%%/images/member/faceplant.gif
-%%DATADIR%%/images/member/famous.gif
-%%DATADIR%%/images/member/firehair.gif
-%%DATADIR%%/images/member/firehead.gif
-%%DATADIR%%/images/member/fishy.gif
-%%DATADIR%%/images/member/fox.gif
-%%DATADIR%%/images/member/french.gif
-%%DATADIR%%/images/member/frog.gif
-%%DATADIR%%/images/member/frosty.gif
-%%DATADIR%%/images/member/frozen.gif
-%%DATADIR%%/images/member/gemini.gif
-%%DATADIR%%/images/member/ghettofab.gif
-%%DATADIR%%/images/member/giraffe.gif
-%%DATADIR%%/images/member/godevil.gif
-%%DATADIR%%/images/member/gorilla.gif
-%%DATADIR%%/images/member/greenbeer.gif
-%%DATADIR%%/images/member/groom.gif
-%%DATADIR%%/images/member/grrr.gif
-%%DATADIR%%/images/member/hamster.gif
-%%DATADIR%%/images/member/happiness.gif
-%%DATADIR%%/images/member/hit.gif
-%%DATADIR%%/images/member/headbanger.gif
-%%DATADIR%%/images/member/heartglasses.gif
-%%DATADIR%%/images/member/heartshell.gif
-%%DATADIR%%/images/member/hedgehog.gif
-%%DATADIR%%/images/member/hello.gif
-%%DATADIR%%/images/member/hello2.gif
-%%DATADIR%%/images/member/hungry.gif
-%%DATADIR%%/images/member/icecream.gif
-%%DATADIR%%/images/member/iloveu.gif
-%%DATADIR%%/images/member/iloveu2.gif
-%%DATADIR%%/images/member/iloveu3.gif
-%%DATADIR%%/images/member/inlove.gif
-%%DATADIR%%/images/member/itsboy.gif
-%%DATADIR%%/images/member/itsgirl.gif
-%%DATADIR%%/images/member/kiss.gif
-%%DATADIR%%/images/member/kisses.gif
-%%DATADIR%%/images/member/kitty.gif
-%%DATADIR%%/images/member/kittys.gif
-%%DATADIR%%/images/member/laughing1.gif
-%%DATADIR%%/images/member/laughing2.gif
-%%DATADIR%%/images/member/leo.gif
-%%DATADIR%%/images/member/liberty.gif
-%%DATADIR%%/images/member/libra.gif
-%%DATADIR%%/images/member/lion.gif
-%%DATADIR%%/images/member/lips.gif
-%%DATADIR%%/images/member/lollypop.gif
-%%DATADIR%%/images/member/loveletter.gif
-%%DATADIR%%/images/member/lovesick.gif
-%%DATADIR%%/images/member/lovesong.gif
-%%DATADIR%%/images/member/mean.gif
-%%DATADIR%%/images/member/missyou.gif
-%%DATADIR%%/images/member/mistletoe.gif
-%%DATADIR%%/images/member/monalisa.gif
-%%DATADIR%%/images/member/money.gif
-%%DATADIR%%/images/member/money1.gif
-%%DATADIR%%/images/member/monkey.gif
-%%DATADIR%%/images/member/moony.gif
-%%DATADIR%%/images/member/moose.gif
-%%DATADIR%%/images/member/morning.gif
-%%DATADIR%%/images/member/morph.gif
-%%DATADIR%%/images/member/mouse.gif
-%%DATADIR%%/images/member/neko.gif
-%%DATADIR%%/images/member/nice.gif
-%%DATADIR%%/images/member/night.gif
-%%DATADIR%%/images/member/no.gif
-%%DATADIR%%/images/member/no2.gif
-%%DATADIR%%/images/member/no3.gif
-%%DATADIR%%/images/member/notfair.gif
-%%DATADIR%%/images/member/pageant.gif
-%%DATADIR%%/images/member/onthecheek.gif
-%%DATADIR%%/images/member/penguin.gif
-%%DATADIR%%/images/member/phone.gif
-%%DATADIR%%/images/member/pig.gif
-%%DATADIR%%/images/member/pisces.gif
-%%DATADIR%%/images/member/pony.gif
-%%DATADIR%%/images/member/pouty.gif
-%%DATADIR%%/images/member/present.gif
-%%DATADIR%%/images/member/pretty.gif
-%%DATADIR%%/images/member/puppy.gif
-%%DATADIR%%/images/member/raccoon.gif
-%%DATADIR%%/images/member/raise.gif
-%%DATADIR%%/images/member/reading.gif
-%%DATADIR%%/images/member/recliner.gif
-%%DATADIR%%/images/member/roadrage.gif
-%%DATADIR%%/images/member/roll.gif
-%%DATADIR%%/images/member/rotfl.gif
-%%DATADIR%%/images/member/ruthere.gif
-%%DATADIR%%/images/member/sad.gif
-%%DATADIR%%/images/member/sagittarius.gif
-%%DATADIR%%/images/member/santahat.gif
-%%DATADIR%%/images/member/scared.gif
-%%DATADIR%%/images/member/scorpio.gif
-%%DATADIR%%/images/member/shamrock.gif
-%%DATADIR%%/images/member/shaving.gif
-%%DATADIR%%/images/member/sheep.gif
-%%DATADIR%%/images/member/shiver.gif
-%%DATADIR%%/images/member/shocked.gif
-%%DATADIR%%/images/member/sickly.gif
-%%DATADIR%%/images/member/situp.gif
-%%DATADIR%%/images/member/slugger1.gif
-%%DATADIR%%/images/member/slugger2.gif
-%%DATADIR%%/images/member/smoker.gif
-%%DATADIR%%/images/member/snake.gif
-%%DATADIR%%/images/member/snappy.gif
-%%DATADIR%%/images/member/sneaky.gif
-%%DATADIR%%/images/member/snowball.gif
-%%DATADIR%%/images/member/snowstorm.gif
-%%DATADIR%%/images/member/snowstorm2.gif
-%%DATADIR%%/images/member/sobored.gif
-%%DATADIR%%/images/member/soccergirl.gif
-%%DATADIR%%/images/member/sorry.gif
-%%DATADIR%%/images/member/spaghetti.gif
-%%DATADIR%%/images/member/spaz.gif
-%%DATADIR%%/images/member/squirrel.gif
-%%DATADIR%%/images/member/surrender.gif
-%%DATADIR%%/images/member/sweaty.gif
-%%DATADIR%%/images/member/tanny.gif
-%%DATADIR%%/images/member/taurus.gif
-%%DATADIR%%/images/member/throwcomputer.gif
-%%DATADIR%%/images/member/Thumbs.db
-%%DATADIR%%/images/member/thumbsdown.gif
-%%DATADIR%%/images/member/tiger.gif
-%%DATADIR%%/images/member/toiletreading.gif
-%%DATADIR%%/images/member/tongue.gif
-%%DATADIR%%/images/member/tongueout1.gif
-%%DATADIR%%/images/member/tongueout2.gif
-%%DATADIR%%/images/member/torch.gif
-%%DATADIR%%/images/member/trampoline.gif
-%%DATADIR%%/images/member/trapped.gif
-%%DATADIR%%/images/member/tree.gif
-%%DATADIR%%/images/member/turtle.gif
-%%DATADIR%%/images/member/uniform.gif
-%%DATADIR%%/images/member/virgo.gif
-%%DATADIR%%/images/member/vomit.gif
-%%DATADIR%%/images/member/wakka.gif
-%%DATADIR%%/images/member/walkingdong.gif
-%%DATADIR%%/images/member/weddingcake.gif
-%%DATADIR%%/images/member/whistle.gif
-%%DATADIR%%/images/member/wink.gif
-%%DATADIR%%/images/member/wiseguy.gif
-%%DATADIR%%/images/member/woohoo.gif
-%%DATADIR%%/images/member/aerobics.gif
-%%DATADIR%%/images/03.png
-%%DATADIR%%/images/04.png
-%%DATADIR%%/images/05.png
-%%DATADIR%%/images/06.png
-%%DATADIR%%/images/07.png
-%%DATADIR%%/images/08.png
-%%DATADIR%%/images/09.png
-%%DATADIR%%/images/10.png
-%%DATADIR%%/images/11.png
-%%DATADIR%%/images/12.png
-%%DATADIR%%/images/13.png
-%%DATADIR%%/images/14.png
-%%DATADIR%%/images/15.png
-%%DATADIR%%/images/16.png
-%%DATADIR%%/images/17.png
-%%DATADIR%%/images/18.png
-%%DATADIR%%/images/19.png
-%%DATADIR%%/images/20.png
-%%DATADIR%%/images/21.png
-%%DATADIR%%/images/22.png
-%%DATADIR%%/images/23.png
-%%DATADIR%%/images/24.png
-%%DATADIR%%/images/25.png
-%%DATADIR%%/images/26.png
-%%DATADIR%%/images/27.png
-%%DATADIR%%/images/28.png
-%%DATADIR%%/images/29.png
-%%DATADIR%%/images/30.png
-%%DATADIR%%/images/31.png
-%%DATADIR%%/images/32.png
-%%DATADIR%%/images/33.png
-%%DATADIR%%/images/34.png
-%%DATADIR%%/images/35.png
-%%DATADIR%%/images/36.png
-%%DATADIR%%/images/37.png
-%%DATADIR%%/images/38.png
-%%DATADIR%%/images/39.png
-%%DATADIR%%/images/40.png
-%%DATADIR%%/images/41.png
-%%DATADIR%%/images/42.png
-%%DATADIR%%/images/43.png
-%%DATADIR%%/images/44.png
-%%DATADIR%%/images/45.png
-%%DATADIR%%/images/46.png
-%%DATADIR%%/images/47.png
-%%DATADIR%%/images/48.png
-%%DATADIR%%/images/49.png
-%%DATADIR%%/images/50.png
-%%DATADIR%%/images/51.png
-%%DATADIR%%/images/52.png
-%%DATADIR%%/images/53.png
-%%DATADIR%%/images/54.png
-%%DATADIR%%/images/55.png
-%%DATADIR%%/images/56.png
-%%DATADIR%%/images/57.png
-%%DATADIR%%/images/58.png
-%%DATADIR%%/images/59.png
-%%DATADIR%%/images/60.png
-%%DATADIR%%/images/61.png
-%%DATADIR%%/images/62.png
-%%DATADIR%%/images/63.png
-%%DATADIR%%/images/64.png
-%%DATADIR%%/images/65.png
-%%DATADIR%%/images/66.png
-%%DATADIR%%/images/blaze.png
-%%DATADIR%%/images/bulb.png
-%%DATADIR%%/images/cloud.png
-%%DATADIR%%/images/i_01.png
-%%DATADIR%%/images/i_02.png
-%%DATADIR%%/images/i_03.png
-%%DATADIR%%/images/i_04.png
-%%DATADIR%%/images/i_05.png
-%%DATADIR%%/images/i_06.png
-%%DATADIR%%/images/i_07.png
-%%DATADIR%%/images/i_08.png
-%%DATADIR%%/images/i_09.png
-%%DATADIR%%/images/lightning.png
-%%DATADIR%%/images/lightning2.png
-%%DATADIR%%/images/music.png
-%%DATADIR%%/images/pistol.png
-%%DATADIR%%/images/rain.png
-%%DATADIR%%/images/ring.png
-%%DATADIR%%/images/Thumbs.db
-%%DATADIR%%/images/01.png
-%%DATADIR%%/images/write.png
-%%DATADIR%%/images/02.png
-%%DATADIR%%/wav/LandBattle/auto.wav
-%%DATADIR%%/wav/LandBattle/dkill.wav
-%%DATADIR%%/wav/LandBattle/train.wav
-%%DATADIR%%/wav/language/Chinese/number9.wav
-%%DATADIR%%/wav/language/Chinese/number10.wav
-%%DATADIR%%/wav/language/Chinese/number2.wav
-%%DATADIR%%/wav/language/Chinese/number3.wav
-%%DATADIR%%/wav/language/Chinese/number4.wav
-%%DATADIR%%/wav/language/Chinese/number5.wav
-%%DATADIR%%/wav/language/Chinese/number6.wav
-%%DATADIR%%/wav/language/Chinese/number7.wav
-%%DATADIR%%/wav/language/Chinese/number8.wav
-%%DATADIR%%/wav/language/Chinese/number1.wav
-%%DATADIR%%/wav/Mahjong/peng.wav
-%%DATADIR%%/wav/Mahjong/02.wav
-%%DATADIR%%/wav/Mahjong/03.wav
-%%DATADIR%%/wav/Mahjong/04.wav
-%%DATADIR%%/wav/Mahjong/05.wav
-%%DATADIR%%/wav/Mahjong/06.wav
-%%DATADIR%%/wav/Mahjong/07.wav
-%%DATADIR%%/wav/Mahjong/11.wav
-%%DATADIR%%/wav/Mahjong/12.wav
-%%DATADIR%%/wav/Mahjong/13.wav
-%%DATADIR%%/wav/Mahjong/14.wav
-%%DATADIR%%/wav/Mahjong/15.wav
-%%DATADIR%%/wav/Mahjong/16.wav
-%%DATADIR%%/wav/Mahjong/17.wav
-%%DATADIR%%/wav/Mahjong/18.wav
-%%DATADIR%%/wav/Mahjong/19.wav
-%%DATADIR%%/wav/Mahjong/21.wav
-%%DATADIR%%/wav/Mahjong/22.wav
-%%DATADIR%%/wav/Mahjong/23.wav
-%%DATADIR%%/wav/Mahjong/24.wav
-%%DATADIR%%/wav/Mahjong/25.wav
-%%DATADIR%%/wav/Mahjong/26.wav
-%%DATADIR%%/wav/Mahjong/27.wav
-%%DATADIR%%/wav/Mahjong/28.wav
-%%DATADIR%%/wav/Mahjong/29.wav
-%%DATADIR%%/wav/Mahjong/31.wav
-%%DATADIR%%/wav/Mahjong/32.wav
-%%DATADIR%%/wav/Mahjong/33.wav
-%%DATADIR%%/wav/Mahjong/34.wav
-%%DATADIR%%/wav/Mahjong/35.wav
-%%DATADIR%%/wav/Mahjong/36.wav
-%%DATADIR%%/wav/Mahjong/37.wav
-%%DATADIR%%/wav/Mahjong/38.wav
-%%DATADIR%%/wav/Mahjong/39.wav
-%%DATADIR%%/wav/Mahjong/bu.wav
-%%DATADIR%%/wav/Mahjong/chi.wav
-%%DATADIR%%/wav/Mahjong/gang.wav
-%%DATADIR%%/wav/Mahjong/hu.wav
-%%DATADIR%%/wav/Mahjong/01.wav
-%%DATADIR%%/wav/Interlink/dec.wav
-%%DATADIR%%/wav/Interlink/inc.wav
-%%DATADIR%%/wav/move.wav
-%%DATADIR%%/wav/msg.wav
-%%DATADIR%%/wav/number1.wav
-%%DATADIR%%/wav/number2.wav
-%%DATADIR%%/wav/number3.wav
-%%DATADIR%%/wav/number4.wav
-%%DATADIR%%/wav/number5.wav
-%%DATADIR%%/wav/number6.wav
-%%DATADIR%%/wav/number7.wav
-%%DATADIR%%/wav/number8.wav
-%%DATADIR%%/wav/number9.wav
-%%DATADIR%%/wav/out.wav
-%%DATADIR%%/wav/call.wav
-%%DATADIR%%/wav/wait.wav
-%%DATADIR%%/wav/click.wav
-%%DATADIR%%/wav/invited.wav
-%%DATADIR%%/wav/kill.wav
-%%DATADIR%%/UpdateHall
-%%DATADIR%%/modules/libBlackjack.so
-%%DATADIR%%/modules/libChaodip.so
-%%DATADIR%%/modules/libChineseChess.so
-%%DATADIR%%/modules/libChudd.so
-%%DATADIR%%/modules/libMahjong.so
-%%DATADIR%%/modules/libGDMahjong.so
-%%DATADIR%%/modules/libGongZhu.so
-%%DATADIR%%/modules/libInterlink.so
-%%DATADIR%%/modules/libLandBattle.so
-%%DATADIR%%/modules/libLandLord.so
-%%DATADIR%%/modules/libNiuNiu.so
-%%DATADIR%%/modules/libRenju.so
-%%DATADIR%%/modules/libShisensho.so
-%%DATADIR%%/modules/libSuoha.so
-%%DATADIR%%/modules/libUpgrade.so
diff --git a/lang/Makefile b/lang/Makefile
index c8aab67de78..03407384875 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -36,7 +36,6 @@
SUBDIR += clang33
SUBDIR += clang34
SUBDIR += clang35
- SUBDIR += clay
SUBDIR += clojure
SUBDIR += clojure-mode.el
SUBDIR += cmucl
diff --git a/lang/clay/Makefile b/lang/clay/Makefile
deleted file mode 100644
index 5b060dbc58c..00000000000
--- a/lang/clay/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-# $FreeBSD$
-
-PORTNAME= clay
-PORTVERSION= 0.1.2
-PORTREVISION= 2
-CATEGORIES= lang
-MASTER_SITES= https://github.com/jckarter/${PORTNAME}/tarball/v${PORTVERSION}/
-DISTNAME= jckarter-${PORTNAME}-v${PORTVERSION}-0-g${GITVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Language designed for generic programming
-
-LICENSE= BSD2CLAUSE
-
-DEPRECATED= No development since July 2013, depends on obsolete clang-3.2
-EXPIRATION_DATE= 2014-12-01
-
-BUILD_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32 \
- clang32:${PORTSDIR}/lang/clang32
-RUN_DEPENDS= clang32:${PORTSDIR}/lang/clang32
-
-OPTIONS_DEFINE= BINDGEN DOCS
-BINDGEN_DESC= Build with binding generator (broken on 10.0+)
-
-GITVERSION= 751ebe3
-PATCH_STRIP= -p1
-WRKSRC= ${WRKDIR}/jckarter-${PORTNAME}-${GITVERSION}
-
-ONLY_FOR_ARCHS= i386 amd64
-
-USES= cmake
-CMAKE_ARGS+= -G "Unix Makefiles" -DBUILD_FIX=false
-
-CC= clang32
-CXX= clang++32
-
-OPTIONS_SUB= yes
-BINDGEN_CMAKE_OFF= -DBUILD_BINDGEN=false
-
-.include <bsd.port.mk>
diff --git a/lang/clay/distinfo b/lang/clay/distinfo
deleted file mode 100644
index aef9833e114..00000000000
--- a/lang/clay/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jckarter-clay-v0.1.2-0-g751ebe3.tar.gz) = fdb460383c3dbed14cbcd9b2687d6120215e539fa87840fd5247ba599903f857
-SIZE (jckarter-clay-v0.1.2-0-g751ebe3.tar.gz) = 2834720
diff --git a/lang/clay/files/patch-llvm32 b/lang/clay/files/patch-llvm32
deleted file mode 100644
index ffa37a3f06f..00000000000
--- a/lang/clay/files/patch-llvm32
+++ /dev/null
@@ -1,508 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89930e5..99ef0cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,16 +15,16 @@
- if(UNIX)
- set(LLVM_DIR "/usr/local" CACHE PATH "llvm install path")
-
-- find_program(LLVM_CONFIG llvm-config ${LLVM_DIR}/bin
-- DOC "path to llvm-config")
-+ find_program(LLVM_CONFIG llvm-config32 ${LLVM_DIR}/bin
-+ DOC "path to llvm-config32")
-
- execute_process(
- COMMAND ${LLVM_CONFIG} --version
- OUTPUT_VARIABLE LLVM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-- if(NOT ${LLVM_VERSION} STREQUAL "3.1")
-- message(FATAL_ERROR "Clay requires LLVM 3.1.")
-+ if(NOT ${LLVM_VERSION} STREQUAL "3.2")
-+ message(FATAL_ERROR "Clay requires LLVM 3.2.")
- endif()
-
- execute_process(
-diff --git a/README.txt b/README.txt
-index 855a4ab..7999b24 100644
---- a/README.txt
-+++ b/README.txt
-@@ -9,7 +9,7 @@ Visit http://claylabs.com/clay for more information.
- Pre-requisites
- --------------
-
--Clay requires LLVM 3.1, Clang 3.1, and CMake version 2.6 or later.
-+Clay requires LLVM 3.2, Clang 3.2, and CMake version 2.6 or later.
-
- CMake Configuration
- -------------------
-@@ -20,7 +20,7 @@ be customized by passing cmake arguments of the form
- CMake variables such as CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE, Clay's
- build system uses the following variables:
-
--* LLVM_DIR can be set to the install prefix of an LLVM 3.1 installation.
-+* LLVM_DIR can be set to the install prefix of an LLVM 3.2 installation.
- If not set, CMake will look for an 'llvm-config' script on the PATH.
- * PYTHON_EXECUTABLE can be set to the path of a Python 2.x interpreter.
- Clay uses a Python 2 script to drive its test suite. Some platforms
-@@ -70,7 +70,7 @@ and the MSVC compiler. There are some issues with Debug builds and
- LLVM, so both LLVM and Clay will need to be built as Release. The
- default LLVM install directory needs Administrator permissions, so
- you may want to set a CMAKE_INSTALL_PREFIX as well. to change it.
--Place the Clang repository in llvm-3.1/tools/clang so that LLVM builds
-+Place the Clang repository in llvm-3.2/tools/clang so that LLVM builds
- it automatically and compile LLVM with the following commands:
-
- mkdir build
-diff --git a/compiler/src/clay.hpp b/compiler/src/clay.hpp
-index 339b262..2c95623 100644
---- a/compiler/src/clay.hpp
-+++ b/compiler/src/clay.hpp
-@@ -27,8 +27,6 @@
- #endif
-
- #include <llvm/ADT/Triple.h>
--#include <llvm/Analysis/DebugInfo.h>
--#include <llvm/Analysis/DIBuilder.h>
- #include <llvm/Assembly/Writer.h>
- #include <llvm/Assembly/Parser.h>
- #include <llvm/Assembly/PrintModulePass.h>
-@@ -36,12 +34,16 @@
- #include <llvm/Bitcode/ReaderWriter.h>
- #include <llvm/CodeGen/LinkAllAsmWriterComponents.h>
- #include <llvm/CodeGen/LinkAllCodegenComponents.h>
-+#include <llvm/DataLayout.h>
-+#include <llvm/DebugInfo.h>
- #include <llvm/DerivedTypes.h>
-+#include <llvm/DIBuilder.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
- #include <llvm/ExecutionEngine/GenericValue.h>
- #include <llvm/ExecutionEngine/JIT.h>
- #include <llvm/Function.h>
- #include <llvm/Intrinsics.h>
-+#include <llvm/IRBuilder.h>
- #include <llvm/LinkAllVMCore.h>
- #include <llvm/LLVMContext.h>
- #include <llvm/Module.h>
-@@ -50,7 +52,6 @@
- #include <llvm/Support/FileSystem.h>
- #include <llvm/Support/FormattedStream.h>
- #include <llvm/Support/Host.h>
--#include <llvm/Support/IRBuilder.h>
- #include <llvm/Support/MemoryBuffer.h>
- #include <llvm/Support/Path.h>
- #include <llvm/Support/PathV2.h>
-@@ -59,7 +60,6 @@
- #include <llvm/Support/TargetSelect.h>
- #include <llvm/Support/TargetSelect.h>
- #include <llvm/Support/raw_ostream.h>
--#include <llvm/Target/TargetData.h>
- #include <llvm/Target/TargetOptions.h>
- #include <llvm/Transforms/IPO/PassManagerBuilder.h>
- #include <llvm/Transforms/IPO.h>
-@@ -3450,7 +3450,7 @@ static const unsigned short DW_LANG_user_CLAY = 0xC1A4;
-
- extern llvm::Module *llvmModule;
- extern llvm::DIBuilder *llvmDIBuilder;
--extern const llvm::TargetData *llvmTargetData;
-+extern const llvm::DataLayout *llvmDataLayout;
-
- llvm::PointerType *exceptionReturnType();
- llvm::Value *noExceptionReturnValue();
-diff --git a/compiler/src/codegen.cpp b/compiler/src/codegen.cpp
-index f6ed737..1fb574e 100644
---- a/compiler/src/codegen.cpp
-+++ b/compiler/src/codegen.cpp
-@@ -5,7 +5,7 @@ namespace clay {
- llvm::Module *llvmModule = NULL;
- llvm::DIBuilder *llvmDIBuilder = NULL;
- llvm::ExecutionEngine *llvmEngine;
--const llvm::TargetData *llvmTargetData;
-+const llvm::DataLayout *llvmDataLayout;
-
- static vector<CValuePtr> initializedGlobals;
- static CodegenContextPtr constructorsCtx;
-@@ -2886,7 +2886,10 @@ void codegenCodeBody(InvokeEntryPtr entry)
- llvmModule);
-
- for (unsigned i = 1; i <= llArgTypes.size(); ++i) {
-- llFunc->addAttribute(i, llvm::Attribute::NoAlias);
-+ llvm::Attributes attrs = llvm::Attributes::get(
-+ llFunc->getContext(),
-+ llvm::Attributes::NoAlias);
-+ llFunc->addAttribute(i, attrs);
- }
-
- entry->llvmFunc = llFunc;
-@@ -2903,15 +2906,22 @@ void codegenCodeBody(InvokeEntryPtr entry)
- for (unsigned i = 0; i < entry->argsKey.size(); ++i) {
- llvm::DIType argType = llvmTypeDebugInfo(entry->argsKey[i]);
- llvm::DIType argRefType
-- = llvmDIBuilder->createReferenceType(argType);
-+ = llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
-+ argType);
- debugParamTypes.push_back(argRefType);
- }
- for (unsigned i = 0; i < entry->returnTypes.size(); ++i) {
- llvm::DIType returnType = llvmTypeDebugInfo(entry->returnTypes[i]);
- llvm::DIType returnRefType = entry->returnIsRef[i]
- ? llvmDIBuilder->createReferenceType(
-- llvmDIBuilder->createReferenceType(returnType))
-- : llvmDIBuilder->createReferenceType(returnType);
-+ llvm::dwarf::DW_TAG_reference_type,
-+ llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
-+ returnType))
-+ : llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
-+ returnType);
-
- debugParamTypes.push_back(returnRefType);
- }
-@@ -2983,6 +2993,7 @@ void codegenCodeBody(InvokeEntryPtr entry)
- file, // file
- line, // line
- llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
- llvmTypeDebugInfo(entry->fixedArgTypes[i])), // type
- true, // alwaysPreserve
- 0, // flags
-@@ -3025,6 +3036,7 @@ void codegenCodeBody(InvokeEntryPtr entry)
- file, // file
- line, // line
- llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
- llvmTypeDebugInfo(entry->varArgTypes[i])), // type
- true, // alwaysPreserve
- 0, // flags
-@@ -3084,6 +3096,7 @@ void codegenCodeBody(InvokeEntryPtr entry)
- file, // file
- line, // line
- llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
- llvmTypeDebugInfo(returns[i].type)), // type
- true, // alwaysPreserve
- 0, // flags
-@@ -4076,6 +4089,7 @@ EnvPtr codegenBinding(BindingPtr x, EnvPtr env, CodegenContextPtr ctx)
- file, // file
- line, // line
- llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
- llvmTypeDebugInfo(pv->type)), // type
- true, // alwaysPreserve
- 0, // flags
-@@ -4133,6 +4147,7 @@ EnvPtr codegenBinding(BindingPtr x, EnvPtr env, CodegenContextPtr ctx)
- pv->isTemp
- ? llvmTypeDebugInfo(pv->type)
- : llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
- llvmTypeDebugInfo(pv->type)), // type
- true, // alwaysPreserve
- 0, // flags
-@@ -6464,8 +6479,8 @@ llvm::TargetMachine *initLLVM(std::string const &targetTriple,
- targetTriple, "", "", llvm::TargetOptions(), reloc, codeModel);
-
- if (targetMachine != NULL) {
-- llvmTargetData = targetMachine->getTargetData();
-- llvmModule->setDataLayout(llvmTargetData->getStringRepresentation());
-+ llvmDataLayout = targetMachine->getDataLayout();
-+ llvmModule->setDataLayout(llvmDataLayout->getStringRepresentation());
- }
-
- return targetMachine;
-diff --git a/compiler/src/externals.cpp b/compiler/src/externals.cpp
-index f7cd333..ba43797 100644
---- a/compiler/src/externals.cpp
-+++ b/compiler/src/externals.cpp
-@@ -23,11 +23,12 @@ static llvm::Value *promoteCVarArg(CallingConv conv,
- }
- case FLOAT_TYPE : {
- FloatType *ft = (FloatType *)t.ptr();
-- if (ft->bits == 32)
-+ if (ft->bits == 32) {
- if(ft->isImaginary)
- return ctx->builder->CreateFPExt(llv, llvmType(imag64Type));
- else
- return ctx->builder->CreateFPExt(llv, llvmType(float64Type));
-+ }
- return llv;
- }
- default :
-@@ -43,8 +44,12 @@ llvm::Type *ExternalTarget::pushReturnType(CallingConv conv,
- if (type == NULL)
- return llvmVoidType();
- else if (typeReturnsBySretPointer(conv, type)) {
-- llArgTypes.push_back(llvmPointerType(type));
-- llAttributes.push_back(make_pair(llArgTypes.size(), llvm::Attribute::StructRet));
-+ llvm::Type *llType = llvmPointerType(type);
-+ llArgTypes.push_back(llType);
-+ llvm::Attributes attrs = llvm::Attributes::get(
-+ llType->getContext(),
-+ llvm::Attributes::StructRet);
-+ llAttributes.push_back(make_pair(llArgTypes.size(), attrs));
- return llvmVoidType();
- } else {
- llvm::Type *bitcastType = typeReturnsAsBitcastType(conv, type);
-@@ -61,8 +66,12 @@ void ExternalTarget::pushArgumentType(CallingConv conv,
- vector< pair<unsigned, llvm::Attributes> > &llAttributes)
- {
- if (typePassesByByvalPointer(conv, type, false)) {
-- llArgTypes.push_back(llvmPointerType(type));
-- llAttributes.push_back(make_pair(llArgTypes.size(), llvm::Attribute::ByVal));
-+ llvm::Type *llType = llvmPointerType(type);
-+ llArgTypes.push_back(llType);
-+ llvm::Attributes attrs = llvm::Attributes::get(
-+ llType->getContext(),
-+ llvm::Attributes::ByVal);
-+ llAttributes.push_back(make_pair(llArgTypes.size(), attrs));
- } else {
- llvm::Type *bitcastType = typePassesAsBitcastType(conv, type, false);
- if (bitcastType != NULL)
-@@ -171,7 +180,10 @@ void ExternalTarget::loadStructRetArgument(CallingConv conv,
- CValuePtr out0 = out->values[0];
- assert(out0->type == type);
- llArgs.push_back(out0->llValue);
-- llAttributes.push_back(make_pair(llArgs.size(), llvm::Attribute::StructRet));
-+ llvm::Attributes attrs = llvm::Attributes::get(
-+ out0->llValue->getContext(),
-+ llvm::Attributes::StructRet);
-+ llAttributes.push_back(make_pair(llArgs.size(), attrs));
- }
- }
-
-@@ -183,7 +195,10 @@ void ExternalTarget::loadArgument(CallingConv conv,
- {
- if (typePassesByByvalPointer(conv, cv->type, false)) {
- llArgs.push_back(cv->llValue);
-- llAttributes.push_back(make_pair(llArgs.size(), llvm::Attribute::ByVal));
-+ llvm::Attributes attrs = llvm::Attributes::get(
-+ cv->llValue->getContext(),
-+ llvm::Attributes::ByVal);
-+ llAttributes.push_back(make_pair(llArgs.size(), attrs));
- } else {
- llvm::Type *bitcastType = typePassesAsBitcastType(conv, cv->type, false);
- if (bitcastType != NULL) {
-@@ -206,7 +221,10 @@ void ExternalTarget::loadVarArgument(CallingConv conv,
- {
- if (typePassesByByvalPointer(conv, cv->type, true)) {
- llArgs.push_back(cv->llValue);
-- llAttributes.push_back(make_pair(llArgs.size(), llvm::Attribute::ByVal));
-+ llvm::Attributes attrs = llvm::Attributes::get(
-+ cv->llValue->getContext(),
-+ llvm::Attributes::ByVal);
-+ llAttributes.push_back(make_pair(llArgs.size(), attrs));
- } else {
- llvm::Type *bitcastType = typePassesAsBitcastType(conv, cv->type, true);
- if (bitcastType != NULL) {
-@@ -845,21 +863,26 @@ llvm::Type *X86_64_ExternalTarget::llvmWordType(TypePtr type)
- llvm::StructType *llType = llvm::StructType::create(llvm::getGlobalContext(), "x86-64 " + typeName(type));
- vector<llvm::Type*> llWordTypes;
- vector<WordClass>::const_iterator i = wordClasses.begin();
-+ size_t size = typeSize(type);
- while (i != wordClasses.end()) {
-+ assert(size > 0);
- switch (*i) {
- // docs don't cover this case. is it possible?
- // e.g. struct { __m128 a; __m256 b; };
- case NO_CLASS:
- assert(false);
- break;
-- case INTEGER:
-- llWordTypes.push_back(llvmIntType(64));
-+ case INTEGER: {
-+ size_t wordSize = size >= 8 ? 64 : size*8;
-+ llWordTypes.push_back(llvmIntType(wordSize));
- ++i;
- break;
-+ }
- case SSE_INT_VECTOR: {
- int vectorRun = 0;
- do { ++vectorRun; ++i; } while (i != wordClasses.end() && *i == SSEUP);
-- // 8-byte int vectors are allocated to MMX registers
-+ // 8-byte int vectors are allocated to MMX registers, so always generate
-+ // a <float x n> vector for 64-bit SSE words.
- if (vectorRun == 1)
- llWordTypes.push_back(llvm::VectorType::get(llvmFloatType(64), vectorRun));
- else
-@@ -913,6 +936,8 @@ llvm::Type *X86_64_ExternalTarget::llvmWordType(TypePtr type)
- assert(false);
- break;
- }
-+ assert(size >= 8 || i == wordClasses.end());
-+ size -= 8;
- }
- llType->setBody(llWordTypes);
- return llType;
-diff --git a/compiler/src/loader.cpp b/compiler/src/loader.cpp
-index cd90f58..78b6a18 100644
---- a/compiler/src/loader.cpp
-+++ b/compiler/src/loader.cpp
-@@ -70,8 +70,8 @@ static std::string getCPU(llvm::Triple const &triple) {
- }
- }
-
--static std::string getPtrSize(const llvm::TargetData *targetData) {
-- switch (targetData->getPointerSizeInBits()) {
-+static std::string getPtrSize(const llvm::DataLayout *dataLayout) {
-+ switch (dataLayout->getPointerSizeInBits()) {
- case 32 : return "32";
- case 64 : return "64";
- default : assert(false); return "";
-@@ -84,7 +84,7 @@ static void initModuleSuffixes() {
- string os = getOS(triple);
- string osgroup = getOSGroup(triple);
- string cpu = getCPU(triple);
-- string bits = getPtrSize(llvmTargetData);
-+ string bits = getPtrSize(llvmDataLayout);
- moduleSuffixes.push_back("." + os + "." + cpu + "." + bits + ".clay");
- moduleSuffixes.push_back("." + os + "." + cpu + ".clay");
- moduleSuffixes.push_back("." + os + "." + bits + ".clay");
-diff --git a/compiler/src/main.cpp b/compiler/src/main.cpp
-index f2fbd85..a24c20f 100644
---- a/compiler/src/main.cpp
-+++ b/compiler/src/main.cpp
-@@ -72,12 +72,12 @@
- llvm::PassManager passes;
-
- string moduleDataLayout = module->getDataLayout();
-- llvm::TargetData *td = new llvm::TargetData(moduleDataLayout);
-- passes.add(td);
-+ llvm::DataLayout *dl = new llvm::DataLayout(moduleDataLayout);
-+ passes.add(dl);
-
- llvm::FunctionPassManager fpasses(module);
-
-- fpasses.add(new llvm::TargetData(*td));
-+ fpasses.add(new llvm::DataLayout(*dl));
-
- addOptimizationPasses(passes, fpasses, optLevel, internalize);
-
-@@ -116,7 +116,7 @@
-
- llvm::FunctionPassManager fpasses(module);
-
-- fpasses.add(new llvm::TargetData(module));
-+ fpasses.add(new llvm::DataLayout(module));
- fpasses.add(llvm::createVerifierPass());
-
- targetMachine->setAsmVerbosityDefault(true);
-@@ -180,7 +180,7 @@
- vector<const char *> clangArgs;
- clangArgs.push_back(clangPath.c_str());
-
-- switch (llvmTargetData->getPointerSizeInBits()) {
-+ switch (llvmDataLayout->getPointerSizeInBits()) {
- case 32 :
- clangArgs.push_back("-m32");
- break;
-@@ -943,7 +943,7 @@
- clangPath = llvm::sys::Path();
- #endif
- if (!clangPath.isValid()) {
-- clangPath = llvm::sys::Program::FindProgramByName("clang");
-+ clangPath = llvm::sys::Program::FindProgramByName("clang32");
- }
- if (!clangPath.isValid()) {
- cerr << "error: unable to find clang on the path\n";
-diff --git a/compiler/src/types.cpp b/compiler/src/types.cpp
-index 8f86faa..6990a15 100644
---- a/compiler/src/types.cpp
-+++ b/compiler/src/types.cpp
-@@ -43,11 +43,11 @@ static vector<vector<StaticTypePtr> > staticTypes;
- //
-
- static size_t llTypeSize(llvm::Type *llt) {
-- return (size_t)llvmTargetData->getTypeAllocSize(llt);
-+ return (size_t)llvmDataLayout->getTypeAllocSize(llt);
- }
-
- static size_t llTypeAlignment(llvm::Type *llt) {
-- return (size_t)llvmTargetData->getABITypeAlignment(llt);
-+ return (size_t)llvmDataLayout->getABITypeAlignment(llt);
- }
-
- static size_t debugTypeSize(llvm::Type *llt) {
-@@ -81,7 +81,7 @@ void initTypes() {
- complex80Type = new ComplexType(80);
-
- cIntType = int32Type;
-- switch (llvmTargetData->getPointerSizeInBits()) {
-+ switch (llvmDataLayout->getPointerSizeInBits()) {
- case 32 :
- cSizeTType = uint32Type;
- cPtrDiffTType = int32Type;
-@@ -826,7 +826,7 @@ const llvm::StructLayout *tupleTypeLayout(TupleType *t) {
- if (t->layout == NULL) {
- llvm::StructType *st =
- llvm::cast<llvm::StructType>(llvmType(t));
-- t->layout = llvmTargetData->getStructLayout(st);
-+ t->layout = llvmDataLayout->getStructLayout(st);
- }
- return t->layout;
- }
-@@ -835,7 +835,7 @@ const llvm::StructLayout *complexTypeLayout(ComplexType *t) {
- if (t->layout == NULL) {
- llvm::StructType *st =
- llvm::cast<llvm::StructType>(llvmType(t));
-- t->layout = llvmTargetData->getStructLayout(st);
-+ t->layout = llvmDataLayout->getStructLayout(st);
- }
- return t->layout;
- }
-@@ -844,7 +844,7 @@ const llvm::StructLayout *recordTypeLayout(RecordType *t) {
- if (t->layout == NULL) {
- llvm::StructType *st =
- llvm::cast<llvm::StructType>(llvmType(t));
-- t->layout = llvmTargetData->getStructLayout(st);
-+ t->layout = llvmDataLayout->getStructLayout(st);
- }
- return t->layout;
- }
-@@ -1101,15 +1101,22 @@ static void declareLLVMType(TypePtr t) {
- for (unsigned i = 0; i < x->argTypes.size(); ++i) {
- llvm::DIType argType = llvmTypeDebugInfo(x->argTypes[i]);
- llvm::DIType argRefType
-- = llvmDIBuilder->createReferenceType(argType);
-+ = llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
-+ argType);
- debugParamTypes.push_back(argRefType);
- }
- for (unsigned i = 0; i < x->returnTypes.size(); ++i) {
- llvm::DIType returnType = llvmTypeDebugInfo(x->returnTypes[i]);
- llvm::DIType returnRefType = x->returnIsRef[i]
- ? llvmDIBuilder->createReferenceType(
-- llvmDIBuilder->createReferenceType(returnType))
-- : llvmDIBuilder->createReferenceType(returnType);
-+ llvm::dwarf::DW_TAG_reference_type,
-+ llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
-+ returnType))
-+ : llvmDIBuilder->createReferenceType(
-+ llvm::dwarf::DW_TAG_reference_type,
-+ returnType);
-
- debugParamTypes.push_back(returnRefType);
- }
-@@ -1259,7 +1266,8 @@ static void declareLLVMType(TypePtr t) {
- line,
- debugTypeSize(t->llType),
- debugTypeAlignment(t->llType),
-- enumArray);
-+ enumArray,
-+ llvm::DIType());
- }
- break;
- }
-@@ -1358,8 +1366,8 @@ static void defineLLVMType(TypePtr t) {
- size_t maxSize = 0;
- for (unsigned i = 0; i < x->memberTypes.size(); ++i) {
- llvm::Type *llt = llvmType(x->memberTypes[i]);
-- size_t align = (size_t)llvmTargetData->getABITypeAlignment(llt);
-- size_t size = (size_t)llvmTargetData->getTypeAllocSize(llt);
-+ size_t align = (size_t)llvmDataLayout->getABITypeAlignment(llt);
-+ size_t size = (size_t)llvmDataLayout->getTypeAllocSize(llt);
- if (align > maxAlign) {
- maxAlign = align;
- maxAlignType = llt;
diff --git a/lang/clay/pkg-descr b/lang/clay/pkg-descr
deleted file mode 100644
index 199ae7172bb..00000000000
--- a/lang/clay/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Clay is a programming language designed for Generic Programming.
-It provides whole program type propagation and efficient type-specialized
-code generation. Let you write generic programs less verbose and
-have the same memory footprint and runtime overhead as C.
-
-WWW: https://github.com/jckarter/clay
diff --git a/lang/clay/pkg-plist b/lang/clay/pkg-plist
deleted file mode 100644
index 82797095ca1..00000000000
--- a/lang/clay/pkg-plist
+++ /dev/null
@@ -1,352 +0,0 @@
-bin/clay
-%%BINDGEN%%bin/clay-bindgen
-lib/lib-clay/algorithms/algorithms.clay
-lib/lib-clay/algorithms/heaps/heaps.clay
-lib/lib-clay/algorithms/introsort/introsort.clay
-lib/lib-clay/algorithms/permutations/permutations.clay
-lib/lib-clay/algorithms/strings/strings.clay
-lib/lib-clay/any/any.clay
-lib/lib-clay/arrays/arrays.clay
-lib/lib-clay/booleans/booleans.clay
-lib/lib-clay/byteorder/byteorder.clay
-lib/lib-clay/byteorder/byteorder.x86.32.clay
-lib/lib-clay/byteorder/byteorder.x86.64.clay
-lib/lib-clay/byteorder/common/common.clay
-lib/lib-clay/byteorder/constants/constants.clay
-lib/lib-clay/byteorder/platform/platform.arm.clay
-lib/lib-clay/byteorder/platform/platform.clay
-lib/lib-clay/byteorder/platform/platform.ppc.clay
-lib/lib-clay/byteorder/platform/platform.sparc.clay
-lib/lib-clay/byteorder/platform/platform.x86.clay
-lib/lib-clay/characters/characters.clay
-lib/lib-clay/clay/ast/ast.clay
-lib/lib-clay/clay/common/common.clay
-lib/lib-clay/clay/core/core.clay
-lib/lib-clay/clay/diagnostics/diagnostics.clay
-lib/lib-clay/clay/lexer/lexer.clay
-lib/lib-clay/clay/loader/loader.clay
-lib/lib-clay/clay/loader/platform/platform.linux.x86.32.clay
-lib/lib-clay/clay/loader/platform/platform.linux.x86.64.clay
-lib/lib-clay/clay/loader/platform/platform.macosx.x86.32.clay
-lib/lib-clay/clay/loader/platform/platform.macosx.x86.64.clay
-lib/lib-clay/clay/loader/platform/platform.windows.x86.32.clay
-lib/lib-clay/clay/parser/parser.clay
-lib/lib-clay/clay/v0_0/ast/ast.clay
-lib/lib-clay/clay/v0_0/lexer/lexer.clay
-lib/lib-clay/clay/v0_0/parser/parser.clay
-lib/lib-clay/cocoa/appkit/appkit.clay
-lib/lib-clay/cocoa/appkit/generated/Makefile
-lib/lib-clay/cocoa/appkit/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/appkit/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/appkit/generated/generated_from.h
-lib/lib-clay/cocoa/applicationservices/applicationservices.clay
-lib/lib-clay/cocoa/applicationservices/generated/Makefile
-lib/lib-clay/cocoa/applicationservices/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/applicationservices/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/applicationservices/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/applicationservices/generated/generated_from_arm.h
-lib/lib-clay/cocoa/applicationservices/generated/generated_from_x86.h
-lib/lib-clay/cocoa/audiotoolbox/audiotoolbox.clay
-lib/lib-clay/cocoa/audiotoolbox/generated/Makefile
-lib/lib-clay/cocoa/audiotoolbox/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/audiotoolbox/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/audiotoolbox/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/audiotoolbox/generated/generated_from.h
-lib/lib-clay/cocoa/cocoa.macosx.clay
-lib/lib-clay/cocoa/coreaudio/coreaudio.clay
-lib/lib-clay/cocoa/coreaudio/generated/Makefile
-lib/lib-clay/cocoa/coreaudio/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/coreaudio/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/coreaudio/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/coreaudio/generated/generated_from_arm.h
-lib/lib-clay/cocoa/coreaudio/generated/generated_from_x86.h
-lib/lib-clay/cocoa/corefoundation/corefoundation.clay
-lib/lib-clay/cocoa/corefoundation/generated/Makefile
-lib/lib-clay/cocoa/corefoundation/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/corefoundation/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/corefoundation/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/corefoundation/generated/generated_from.h
-lib/lib-clay/cocoa/coreservices/coreservices.clay
-lib/lib-clay/cocoa/coreservices/generated/Makefile
-lib/lib-clay/cocoa/coreservices/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/coreservices/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/coreservices/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/coreservices/generated/generated_from_arm.h
-lib/lib-clay/cocoa/coreservices/generated/generated_from_x86.h
-lib/lib-clay/cocoa/foundation/foundation.clay
-lib/lib-clay/cocoa/foundation/generated/Makefile
-lib/lib-clay/cocoa/foundation/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/foundation/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/foundation/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/foundation/generated/generated_from.h
-lib/lib-clay/cocoa/nib/nib.clay
-lib/lib-clay/cocoa/objc/objc.clay
-lib/lib-clay/cocoa/objc/platform/platform.arm.clay
-lib/lib-clay/cocoa/objc/platform/platform.x86.32.clay
-lib/lib-clay/cocoa/objc/platform/platform.x86.64.clay
-lib/lib-clay/cocoa/objc/runtime/runtime.clay
-lib/lib-clay/cocoa/qtkit/generated/Makefile
-lib/lib-clay/cocoa/qtkit/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/qtkit/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/qtkit/generated/generated_from.h
-lib/lib-clay/cocoa/qtkit/qtkit.clay
-lib/lib-clay/cocoa/quartzcore/generated/Makefile
-lib/lib-clay/cocoa/quartzcore/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/quartzcore/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/quartzcore/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/quartzcore/generated/generated_from.h
-lib/lib-clay/cocoa/quartzcore/quartzcore.clay
-lib/lib-clay/cocoa/test/test.clay
-lib/lib-clay/cocoa/uikit/generated/Makefile
-lib/lib-clay/cocoa/uikit/generated/generated.macosx.arm.clay
-lib/lib-clay/cocoa/uikit/generated/generated_from.h
-lib/lib-clay/cocoa/uikit/uikit.clay
-lib/lib-clay/cocoa/util/platform/platform.macosx.arm.clay
-lib/lib-clay/cocoa/util/platform/platform.macosx.x86.clay
-lib/lib-clay/cocoa/util/util.clay
-lib/lib-clay/cocoa/webkit/generated/Makefile
-lib/lib-clay/cocoa/webkit/generated/generated.macosx.x86.32.clay
-lib/lib-clay/cocoa/webkit/generated/generated.macosx.x86.64.clay
-lib/lib-clay/cocoa/webkit/generated/generated_from.h
-lib/lib-clay/cocoa/webkit/webkit.clay
-lib/lib-clay/commandline/dispatch/dispatch.clay
-lib/lib-clay/commandline/options/options.clay
-lib/lib-clay/commandline/options/parser.clay
-lib/lib-clay/commandline/options/spec.clay
-lib/lib-clay/commandline/options/table.clay
-lib/lib-clay/commandline/options/util.clay
-lib/lib-clay/comparators/comparators.clay
-lib/lib-clay/complex/complex.clay
-lib/lib-clay/console/color.clay
-lib/lib-clay/coordinates/coordinates.clay
-lib/lib-clay/defaultarguments/defaultarguments.clay
-lib/lib-clay/deques/deques.clay
-lib/lib-clay/destructors/destructors.clay
-lib/lib-clay/enumerations/enumerations.clay
-lib/lib-clay/errors/backtrace/backtrace.clay
-lib/lib-clay/errors/backtrace/backtrace.freebsd.clay
-lib/lib-clay/errors/backtrace/backtrace.linux.clay
-lib/lib-clay/errors/backtrace/backtrace.macosx.clay
-lib/lib-clay/errors/errors.clay
-lib/lib-clay/exceptions/exceptions.clay
-lib/lib-clay/expat/constants/constants.clay
-lib/lib-clay/expat/expat.clay
-lib/lib-clay/expat/generated/Makefile
-lib/lib-clay/expat/generated/generated.clay
-lib/lib-clay/expat/generated/generated_from.h
-lib/lib-clay/externals/externals.clay
-lib/lib-clay/glut/glut.clay
-lib/lib-clay/hash/hash.clay
-lib/lib-clay/hashmaps/hashmaps.clay
-lib/lib-clay/identifiers/identifiers.clay
-lib/lib-clay/interfaces/interfaces.clay
-lib/lib-clay/io/directories/directories.unix.clay
-lib/lib-clay/io/errors/errors.clay
-lib/lib-clay/io/files/api/api.clay
-lib/lib-clay/io/files/easy/easy.clay
-lib/lib-clay/io/files/files.clay
-lib/lib-clay/io/files/lines/lines.clay
-lib/lib-clay/io/files/raw/raw.unix.clay
-lib/lib-clay/io/files/raw/raw.windows.clay
-lib/lib-clay/io/filesystem/executable/executable.linux.clay
-lib/lib-clay/io/filesystem/executable/executable.unix.clay
-lib/lib-clay/io/filesystem/filesystem.unix.clay
-lib/lib-clay/io/filesystem/filesystem.windows.clay
-lib/lib-clay/io/mapping/mapping.unix.clay
-lib/lib-clay/io/mapping/mapping.windows.clay
-lib/lib-clay/io/paths/paths.unix.clay
-lib/lib-clay/io/paths/paths.windows.clay
-lib/lib-clay/io/sockets/platform/platform.unix.clay
-lib/lib-clay/io/sockets/platform/platform.windows.clay
-lib/lib-clay/io/sockets/sockets.clay
-lib/lib-clay/io/streams/streams.clay
-lib/lib-clay/keywordarguments/keywordarguments.clay
-lib/lib-clay/lambdas/lambdas.clay
-lib/lib-clay/libc/generated/Makefile
-lib/lib-clay/libc/generated/generated.freebsd.32.clay
-lib/lib-clay/libc/generated/generated.freebsd.64.clay
-lib/lib-clay/libc/generated/generated.linux.32.clay
-lib/lib-clay/libc/generated/generated.linux.64.clay
-lib/lib-clay/libc/generated/generated.macosx.arm.clay
-lib/lib-clay/libc/generated/generated.macosx.x86.32.clay
-lib/lib-clay/libc/generated/generated.macosx.x86.64.clay
-lib/lib-clay/libc/generated/generated.windows.32.clay
-lib/lib-clay/libc/generated/generated.windows.64.clay
-lib/lib-clay/libc/generated/generated_from_unix.h
-lib/lib-clay/libc/generated/generated_from_win32.h
-lib/lib-clay/libc/libc.freebsd.clay
-lib/lib-clay/libc/libc.linux.clay
-lib/lib-clay/libc/libc.macosx.clay
-lib/lib-clay/libc/libc.windows.32.clay
-lib/lib-clay/libc/libc.windows.64.clay
-lib/lib-clay/llvm/libclang/generated/Makefile
-lib/lib-clay/llvm/libclang/generated/generated.clay
-lib/lib-clay/llvm/libclang/generated/generated_from.h
-lib/lib-clay/llvm/libclang/libclang.clay
-lib/lib-clay/math/libm/libm.clay
-lib/lib-clay/math/math.clay
-lib/lib-clay/math/native/approxmath.clay
-lib/lib-clay/math/native/atan_std.clay
-lib/lib-clay/math/native/bessel_std.clay
-lib/lib-clay/math/native/beta_std.clay
-lib/lib-clay/math/native/bigfloat.clay
-lib/lib-clay/math/native/cbrt_std.clay
-lib/lib-clay/math/native/ccore.clay
-lib/lib-clay/math/native/cnative.clay
-lib/lib-clay/math/native/core.clay
-lib/lib-clay/math/native/defines.clay
-lib/lib-clay/math/native/erf_std.clay
-lib/lib-clay/math/native/exact.clay
-lib/lib-clay/math/native/exp_fast.clay
-lib/lib-clay/math/native/exp_std.clay
-lib/lib-clay/math/native/expm1_std.clay
-lib/lib-clay/math/native/gamma_std.clay
-lib/lib-clay/math/native/log_std.clay
-lib/lib-clay/math/native/native.clay
-lib/lib-clay/math/native/pow_std.clay
-lib/lib-clay/math/native/rem_pi_2.clay
-lib/lib-clay/math/native/sqrt_std.clay
-lib/lib-clay/math/native/trig_std.clay
-lib/lib-clay/math/simd/core_x86.clay
-lib/lib-clay/math/simd/exact.clay
-lib/lib-clay/maybe/maybe.clay
-lib/lib-clay/memory/memory.clay
-lib/lib-clay/memory/platform/platform.clay
-lib/lib-clay/memory/platform/platform.macosx.clay
-lib/lib-clay/numbers/floats/floats.clay
-lib/lib-clay/numbers/numbers.clay
-lib/lib-clay/numbers/overflow/overflow.clay
-lib/lib-clay/numbers/parser/errno/errno.unix.clay
-lib/lib-clay/numbers/parser/errno/errno.windows.clay
-lib/lib-clay/numbers/parser/parser.clay
-lib/lib-clay/opengl/enums/enums.clay
-lib/lib-clay/opengl/lookup/lookup.clay
-lib/lib-clay/opengl/nolookup/nolookup.clay
-lib/lib-clay/opengl/opengl.clay
-lib/lib-clay/opengl/platform/platform.macosx.clay
-lib/lib-clay/opengl/platform/platform.unix.clay
-lib/lib-clay/opengl/platform/platform.windows.clay
-lib/lib-clay/opengl/types/types.clay
-lib/lib-clay/operators/operators.clay
-lib/lib-clay/operators/pod/pod.clay
-lib/lib-clay/os/errors/errors.clay
-lib/lib-clay/os/errors/platform/platform.unix.clay
-lib/lib-clay/os/errors/platform/platform.windows.clay
-lib/lib-clay/paged/allocator/allocator.clay
-lib/lib-clay/paged/misc/misc.clay
-lib/lib-clay/paged/namedscalars/namedscalars.clay
-lib/lib-clay/paged/namedvectors/namedvectors.clay
-lib/lib-clay/paged/paged.clay
-lib/lib-clay/paged/sharedpointers/sharedpointers.clay
-lib/lib-clay/paged/strings/strings.clay
-lib/lib-clay/paged/vectors/vectors.clay
-lib/lib-clay/parsing/combinators/generic/generic.clay
-lib/lib-clay/parsing/combinators/strings/strings.clay
-lib/lib-clay/parsing/combinators/wrapper/wrapper.clay
-lib/lib-clay/platform/cpu/cpu.arm.clay
-lib/lib-clay/platform/cpu/cpu.ppc.32.clay
-lib/lib-clay/platform/cpu/cpu.ppc.64.clay
-lib/lib-clay/platform/cpu/cpu.x86.32.clay
-lib/lib-clay/platform/cpu/cpu.x86.64.clay
-lib/lib-clay/platform/os/os.freebsd.clay
-lib/lib-clay/platform/os/os.linux.clay
-lib/lib-clay/platform/os/os.macosx.clay
-lib/lib-clay/platform/os/os.windows.clay
-lib/lib-clay/platform/platform.clay
-lib/lib-clay/platform/symbols/symbols.clay
-lib/lib-clay/pointers/pointers.clay
-lib/lib-clay/prelude/prelude.clay
-lib/lib-clay/printer/formatter/formatter.clay
-lib/lib-clay/printer/platform/platform.clay
-lib/lib-clay/printer/platform/platform.windows.clay
-lib/lib-clay/printer/printer.clay
-lib/lib-clay/queues/queues.clay
-lib/lib-clay/random/random.clay
-lib/lib-clay/records/records.clay
-lib/lib-clay/referencetypes/referencetypes.clay
-lib/lib-clay/remote/marshaling/marshaling.clay
-lib/lib-clay/remote/messages/messages.clay
-lib/lib-clay/sequences/force/force.clay
-lib/lib-clay/sequences/handle/handle.clay
-lib/lib-clay/sequences/lazy/enumerated/enumerated.clay
-lib/lib-clay/sequences/lazy/filtered/filtered.clay
-lib/lib-clay/sequences/lazy/grouped/grouped.clay
-lib/lib-clay/sequences/lazy/lazy.clay
-lib/lib-clay/sequences/lazy/mapped/mapped.clay
-lib/lib-clay/sequences/lazy/range/range.clay
-lib/lib-clay/sequences/lazy/reversed/reversed.clay
-lib/lib-clay/sequences/lazy/sliced/sliced.clay
-lib/lib-clay/sequences/lazy/zipped/zipped.clay
-lib/lib-clay/sequences/sequences.clay
-lib/lib-clay/sequences/util/util.clay
-lib/lib-clay/sha2/sha2.clay
-lib/lib-clay/sharedpointers/sharedpointers.clay
-lib/lib-clay/simd/primitives/primitives.clay
-lib/lib-clay/simd/simd.clay
-lib/lib-clay/statics/statics.clay
-lib/lib-clay/strings/constants/constants.clay
-lib/lib-clay/strings/cstringrefs/cstringrefs.clay
-lib/lib-clay/strings/encodings/utf8/utf8.clay
-lib/lib-clay/strings/strings.clay
-lib/lib-clay/system/platform/platform.clay
-lib/lib-clay/system/platform/testing.clay
-lib/lib-clay/system/platform/testing.unix.clay
-lib/lib-clay/system/platform/testing.windows.clay
-lib/lib-clay/system/system.clay
-lib/lib-clay/test/memory/memory.clay
-lib/lib-clay/test/memory2/memory2.clay
-lib/lib-clay/test/test.clay
-lib/lib-clay/time/platform/platform.freebsd.clay
-lib/lib-clay/time/platform/platform.linux.clay
-lib/lib-clay/time/platform/platform.macosx.clay
-lib/lib-clay/time/platform/platform.windows.clay
-lib/lib-clay/time/time.clay
-lib/lib-clay/tuples/tuples.clay
-lib/lib-clay/twohash/implementation/implementation.clay
-lib/lib-clay/twohash/twohash.clay
-lib/lib-clay/types/platform/platform.32.clay
-lib/lib-clay/types/platform/platform.64.clay
-lib/lib-clay/types/platform/platform.windows.64.clay
-lib/lib-clay/types/types.clay
-lib/lib-clay/unions/unions.clay
-lib/lib-clay/uniquepointers/uniquepointers.clay
-lib/lib-clay/unix/constants/constants.freebsd.clay
-lib/lib-clay/unix/constants/constants.linux.clay
-lib/lib-clay/unix/constants/constants.macosx.clay
-lib/lib-clay/unix/errno/errno.freebsd.clay
-lib/lib-clay/unix/errno/errno.linux.clay
-lib/lib-clay/unix/errno/errno.macosx.clay
-lib/lib-clay/unix/errnonames/errnonames.freebsd.clay
-lib/lib-clay/unix/errnonames/errnonames.linux.clay
-lib/lib-clay/unix/errnonames/errnonames.macosx.clay
-lib/lib-clay/unix/generated/Makefile
-lib/lib-clay/unix/generated/generated.freebsd.32.clay
-lib/lib-clay/unix/generated/generated.freebsd.64.clay
-lib/lib-clay/unix/generated/generated.linux.32.clay
-lib/lib-clay/unix/generated/generated.linux.64.clay
-lib/lib-clay/unix/generated/generated.macosx.arm.clay
-lib/lib-clay/unix/generated/generated.macosx.x86.32.clay
-lib/lib-clay/unix/generated/generated.macosx.x86.64.clay
-lib/lib-clay/unix/generated/generated_from_freebsd.h
-lib/lib-clay/unix/generated/generated_from_linux.h
-lib/lib-clay/unix/generated/generated_from_macosx.h
-lib/lib-clay/unix/unix.clay
-lib/lib-clay/values/values.clay
-lib/lib-clay/variants/nested/nested.clay
-lib/lib-clay/variants/variants.clay
-lib/lib-clay/vectors/buffer/buffer.clay
-lib/lib-clay/vectors/generic/generic.clay
-lib/lib-clay/vectors/vectors.clay
-lib/lib-clay/win32/constants/constants.clay
-lib/lib-clay/win32/errno/errno.clay
-lib/lib-clay/win32/errorcodes/errorcodes.clay
-lib/lib-clay/win32/errornames/errornames.clay
-lib/lib-clay/win32/generated/Makefile
-lib/lib-clay/win32/generated/generated.windows.32.clay
-lib/lib-clay/win32/generated/generated.windows.64.clay
-lib/lib-clay/win32/generated/generated_from.h
-lib/lib-clay/win32/platform/platform.windows.32.clay
-lib/lib-clay/win32/platform/platform.windows.64.clay
-lib/lib-clay/win32/win32.clay
-%%PORTDOCS%%%%DOCSDIR%%/language-reference.md
-%%PORTDOCS%%%%DOCSDIR%%/primitives-reference.md
diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile
index a68f696a7f2..aa0ea401dd2 100644
--- a/ports-mgmt/Makefile
+++ b/ports-mgmt/Makefile
@@ -33,7 +33,6 @@
SUBDIR += pkgcompare
SUBDIR += pkg-devel
SUBDIR += pkg-orphan
- SUBDIR += pkg-plist
SUBDIR += pkg-rmleaf
SUBDIR += pkg_cleanup
SUBDIR += pkg_cutleaves
diff --git a/ports-mgmt/pkg-plist/Makefile b/ports-mgmt/pkg-plist/Makefile
deleted file mode 100644
index 93bb2e0e85d..00000000000
--- a/ports-mgmt/pkg-plist/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Martin Tournoij <martin@arp242.net>
-# $FreeBSD$
-
-PORTNAME= pkg-plist
-PORTVERSION= 1.2
-CATEGORIES= ports-mgmt python
-MASTER_SITES= http://code.arp242.net/pkg-plist/downloads/
-
-MAINTAINER= martin@arp242.net
-COMMENT= Generate a pkg-plist for a port
-
-LICENSE= MIT
-
-USES= python
-NO_BUILD= yes
-
-PLIST_FILES= bin/pkg-plist man/man1/pkg-plist.1.gz
-
-DEPRECATED= Generate incorrect plists
-EXPIRATION_DATE= 2014-11-30
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/pkg-plist ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/pkg-plist.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/ports-mgmt/pkg-plist/distinfo b/ports-mgmt/pkg-plist/distinfo
deleted file mode 100644
index 863c4c389e9..00000000000
--- a/ports-mgmt/pkg-plist/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pkg-plist-1.2.tar.gz) = 9cdb872627ad29c211923454faa111d5f85f5c1b5c6c9dba4621923d802a4831
-SIZE (pkg-plist-1.2.tar.gz) = 4064
diff --git a/ports-mgmt/pkg-plist/pkg-descr b/ports-mgmt/pkg-plist/pkg-descr
deleted file mode 100644
index 8d1c366a346..00000000000
--- a/ports-mgmt/pkg-plist/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Make a pkg-plist for a FreeBSD port. Try to be as "automatic" as possible.
-
-That's all it does ;-)
-
-WWW: http://code.arp242.net/pkg-plist
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 097ed22745c..aff0759fde5 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -815,8 +815,6 @@
SUBDIR += rubygem-hammer_cli_foreman_bootdisk
SUBDIR += rubygem-hammer_cli_foreman_ssh
SUBDIR += rubygem-hiera
- SUBDIR += rubygem-hiera-json
- SUBDIR += rubygem-hiera-puppet
SUBDIR += rubygem-librarian-puppet
SUBDIR += rubygem-log4r
SUBDIR += rubygem-mogilefs-client
diff --git a/sysutils/rubygem-hiera-json/Makefile b/sysutils/rubygem-hiera-json/Makefile
deleted file mode 100644
index 20c08ed2890..00000000000
--- a/sysutils/rubygem-hiera-json/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Greg Larkin <glarkin@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= hiera-json
-PORTVERSION= 0.4.0
-CATEGORIES= sysutils rubygems
-MASTER_SITES= RG
-
-MAINTAINER= mat@FreeBSD.org
-COMMENT= Backend for Hiera that queries JSON data
-
-RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet \
- rubygem-hiera>=1.0:${PORTSDIR}/sysutils/rubygem-hiera \
- rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
-
-USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-
-DEPRECATED= Has been incorporated into hiera
-EXPIRATION_DATE= 2014-11-30
-
-.include <bsd.port.mk>
diff --git a/sysutils/rubygem-hiera-json/distinfo b/sysutils/rubygem-hiera-json/distinfo
deleted file mode 100644
index 29ebeac1a54..00000000000
--- a/sysutils/rubygem-hiera-json/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/hiera-json-0.4.0.gem) = 2698c1133a6ce3fd7b839696502df9776d51e038b3868e9dbddba835902cad4c
-SIZE (rubygem/hiera-json-0.4.0.gem) = 4608
diff --git a/sysutils/rubygem-hiera-json/pkg-descr b/sysutils/rubygem-hiera-json/pkg-descr
deleted file mode 100644
index 1ccb962522d..00000000000
--- a/sysutils/rubygem-hiera-json/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Hiera-json is a backend for Hiera that queries JSON data.
-
-WWW: https://github.com/puppetlabs/hiera-json
diff --git a/sysutils/rubygem-hiera-puppet/Makefile b/sysutils/rubygem-hiera-puppet/Makefile
deleted file mode 100644
index 3970a964fd2..00000000000
--- a/sysutils/rubygem-hiera-puppet/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Greg Larkin <glarkin@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= hiera-puppet
-PORTVERSION= 1.0.0
-PORTREVISION= 1
-CATEGORIES= sysutils rubygems
-MASTER_SITES= RG
-
-MAINTAINER= mat@FreeBSD.org
-COMMENT= Data backend for Hiera that queries the Puppet scope for data
-
-RUN_DEPENDS= puppet27>=0:${PORTSDIR}/sysutils/puppet27 \
- rubygem-hiera>=1.0:${PORTSDIR}/sysutils/rubygem-hiera
-
-CONFLICTS= puppet-3.*
-
-USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-PLIST_FILES= bin/extlookup2hiera
-
-DEPRECATED= Has been incorporated into hiera
-EXPIRATION_DATE= 2014-11-30
-
-.include <bsd.port.mk>
diff --git a/sysutils/rubygem-hiera-puppet/distinfo b/sysutils/rubygem-hiera-puppet/distinfo
deleted file mode 100644
index a54c73981ac..00000000000
--- a/sysutils/rubygem-hiera-puppet/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/hiera-puppet-1.0.0.gem) = 4af6a5f644ce82f9e1faf37df0d656c209d04686486fcfd1d29e433a7382c20f
-SIZE (rubygem/hiera-puppet-1.0.0.gem) = 9216
diff --git a/sysutils/rubygem-hiera-puppet/pkg-descr b/sysutils/rubygem-hiera-puppet/pkg-descr
deleted file mode 100644
index 80c9a756f08..00000000000
--- a/sysutils/rubygem-hiera-puppet/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Hiera-puppet is a data backend for Hiera that queries the internal
-Puppet scope for data. The data structure and approach is heavily
-based on work by Nigel Kersten but made more configurable and with
-full hierarchy.
-
-It also includes a Puppet function that works like extlookup() but
-uses the Hiera backends.
-
-WWW: https://github.com/puppetlabs/hiera-puppet