diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | devel/Makefile | 2 | ||||
| -rw-r--r-- | devel/oniguruma/Makefile (renamed from devel/oniguruma6/Makefile) | 2 | ||||
| -rw-r--r-- | devel/oniguruma/distinfo (renamed from devel/oniguruma6/distinfo) | 0 | ||||
| -rw-r--r-- | devel/oniguruma/pkg-descr (renamed from devel/oniguruma6/pkg-descr) | 0 | ||||
| -rw-r--r-- | devel/oniguruma/pkg-plist (renamed from devel/oniguruma6/pkg-plist) | 0 |
6 files changed, 2 insertions, 3 deletions
@@ -9623,3 +9623,4 @@ databases/glom||2017-11-11|Has expired: Broken for more than 6 months math/bargraph||2017-11-11|Has expired: Unfetchable for more than six months (google code has gone away) devel/oniguruma4|devel/oniguruma6|2017-11-12|Upstream no longer maintained, superseded by devel/oniguruma6 devel/oniguruma5|devel/oniguruma6|2017-11-12|Upstream no longer maintained, superseded by devel/oniguruma6 +devel/oniguruma6|devel/oniguruma|2017-11-12|Rename devel/oniguruma6 to oniguruma (no other versions in ports tree) diff --git a/devel/Makefile b/devel/Makefile index d9e2f54a1143..f94bdd469826 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1819,7 +1819,7 @@ SUBDIR += omniNotify SUBDIR += omniORB SUBDIR += omniORB-4.1 - SUBDIR += oniguruma6 + SUBDIR += oniguruma SUBDIR += onscripter SUBDIR += onscripter-1byte SUBDIR += oozie diff --git a/devel/oniguruma6/Makefile b/devel/oniguruma/Makefile index 2e7939b5ee5b..ccb80c2dbec8 100644 --- a/devel/oniguruma6/Makefile +++ b/devel/oniguruma/Makefile @@ -19,8 +19,6 @@ GH_ACCOUNT= kkos OPTIONS_DEFINE= DOCS EXAMPLES -CONFLICTS_INSTALL= oniguruma[45] - PATHFIX_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/devel/oniguruma6/distinfo b/devel/oniguruma/distinfo index 205583e08829..205583e08829 100644 --- a/devel/oniguruma6/distinfo +++ b/devel/oniguruma/distinfo diff --git a/devel/oniguruma6/pkg-descr b/devel/oniguruma/pkg-descr index ea8eea7a47db..ea8eea7a47db 100644 --- a/devel/oniguruma6/pkg-descr +++ b/devel/oniguruma/pkg-descr diff --git a/devel/oniguruma6/pkg-plist b/devel/oniguruma/pkg-plist index bc339a26e6e1..bc339a26e6e1 100644 --- a/devel/oniguruma6/pkg-plist +++ b/devel/oniguruma/pkg-plist |