--- a/components/proftpd/proftpd.p5m	Tue May 10 18:16:07 2016 -0700
+++ b/components/proftpd/proftpd.p5m	Mon May 09 01:27:27 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # PSARC/2011/088
@@ -27,37 +27,41 @@
     value=pkg:/service/network/ftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="FTP Server and Utilities"
 set name=pkg.human-version value=$(HUMAN_VERSION)
+
+# This package name has known conflicts with other packages in the WOS
+set name=pkg.linted.pkglint.manifest004 value=true
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2011/088
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=etc
-file proftpd.conf path=etc/proftpd.conf mode=0644 preserve=true overlay=allow
-dir  path=etc/security
-dir  path=etc/security/auth_attr.d
+#
+# config. file
+file proftpd.conf path=etc/proftpd.conf mode=0644 overlay=allow preserve=true
+#
+# SMF(5)
 file auth_service-network-ftpd \
     path=etc/security/auth_attr.d/service-network-ftpd
-dir  path=etc/security/prof_attr.d
 file prof_service-network-ftpd \
     path=etc/security/prof_attr.d/service-network-ftpd
-dir  path=lib
-dir  path=lib/svc
-dir  path=lib/svc/manifest
-dir  path=lib/svc/manifest/network
 file ftp.xml path=lib/svc/manifest/network/ftp.xml
-dir  path=lib/svc/method
 file svc-ftp path=lib/svc/method/svc-ftp
-dir  path=usr
-dir  path=usr/bin
+#
+# executables
+file path=usr/bin/ftpasswd
 file path=usr/bin/ftpcount
 file path=usr/bin/ftpdctl
+file path=usr/bin/ftpmail
+file path=usr/bin/ftpquota
 file path=usr/bin/ftptop
 file path=usr/bin/ftpwho
 file path=usr/bin/prxs
+#
+# dtrace demo
 file dtrace/example.d path=usr/demo/dtrace/ftp.d
-dir  path=usr/include
-dir  path=usr/include/proftpd
+#
+# headers
+file path=usr/include/proftpd/ascii.h
 file path=usr/include/proftpd/auth.h
 file path=usr/include/proftpd/bindings.h
 file path=usr/include/proftpd/buildstamp.h
@@ -82,12 +86,16 @@
 file path=usr/include/proftpd/ftp.h
 file path=usr/include/proftpd/glibc-glob.h
 file path=usr/include/proftpd/help.h
+file path=usr/include/proftpd/ident.h
 file path=usr/include/proftpd/inet.h
+file path=usr/include/proftpd/lastlog.h
 file path=usr/include/proftpd/libsupp.h
 file path=usr/include/proftpd/log.h
+file path=usr/include/proftpd/memcache.h
 file path=usr/include/proftpd/mkhome.h
 file path=usr/include/proftpd/mod_ctrls.h
 file path=usr/include/proftpd/mod_gss.h
+file path=usr/include/proftpd/mod_log.h
 file path=usr/include/proftpd/mod_tls.h
 file path=usr/include/proftpd/modules.h
 file path=usr/include/proftpd/netacl.h
@@ -103,44 +111,46 @@
 file path=usr/include/proftpd/proftpd.h
 file path=usr/include/proftpd/regexp.h
 file path=usr/include/proftpd/response.h
+file path=usr/include/proftpd/rlimit.h
 file path=usr/include/proftpd/scoreboard.h
 file path=usr/include/proftpd/session.h
 file path=usr/include/proftpd/sets.h
+file path=usr/include/proftpd/stash.h
 file path=usr/include/proftpd/str.h
 file path=usr/include/proftpd/support.h
 file path=usr/include/proftpd/table.h
 file path=usr/include/proftpd/throttle.h
 file path=usr/include/proftpd/timers.h
+file path=usr/include/proftpd/tpl.h
 file path=usr/include/proftpd/trace.h
+file path=usr/include/proftpd/utf8.h
 file path=usr/include/proftpd/var.h
 file path=usr/include/proftpd/version.h
 file path=usr/include/proftpd/xferlog.h
-dir  path=usr/lib
+#
+# dtrace
 file dtrace/ftp.d path=usr/lib/dtrace/ftp.d
-dir  path=usr/lib/help
-dir  path=usr/lib/help/auths
-dir  path=usr/lib/help/auths/locale
-dir  path=usr/lib/help/auths/locale/C
-file ManageFTP.html path=usr/lib/help/auths/locale/C/ManageFTP.html
-dir  path=usr/lib/inet
+#
+# servicing daemon
 file usr/sbin/proftpd path=usr/lib/inet/proftpd
-dir  path=usr/lib/pkgconfig
+#
+# pkg-config
 file path=usr/lib/pkgconfig/proftpd.pc
-dir  path=usr/lib/proftpd
+#
+# modules
 file path=usr/lib/proftpd/mod_auth_gss.so
 file path=usr/lib/proftpd/mod_facl.so
 file path=usr/lib/proftpd/mod_gss.so
 file path=usr/lib/proftpd/mod_tls.so
 file path=usr/lib/proftpd/mod_wrap.so
-dir  path=usr/sbin
+#
+# sbin executables
 file ftprestart.sh path=usr/sbin/ftprestart
 file path=usr/sbin/ftpscrub
 file path=usr/sbin/ftpshut
-dir  path=usr/share
-dir  path=usr/share/doc
-dir  path=usr/share/doc/proftpd
+#
+# documentation
 file doc/Configuration.html path=usr/share/doc/proftpd/Configuration.html
-dir  path=usr/share/doc/proftpd/modules
 file doc/modules/mod_auth_file.html \
     path=usr/share/doc/proftpd/modules/mod_auth_file.html
 file doc/modules/mod_auth_pam.html \
@@ -160,61 +170,49 @@
 file doc/contrib/mod_tls.html path=usr/share/doc/proftpd/modules/mod_tls.html
 file doc/contrib/mod_wrap.html path=usr/share/doc/proftpd/modules/mod_wrap.html
 file proftpd_migration.txt path=usr/share/doc/proftpd/proftpd_migration.txt
-dir  path=usr/share/locale
-dir  path=usr/share/locale/bg_BG
-dir  path=usr/share/locale/bg_BG/LC_MESSAGES
+#
+# .mo files
 file path=usr/share/locale/bg_BG/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/en_US
-dir  path=usr/share/locale/en_US/LC_MESSAGES
 file path=usr/share/locale/en_US/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/fr
-dir  path=usr/share/locale/fr/LC_MESSAGES
+file path=usr/share/locale/es_ES/LC_MESSAGES/proftpd.mo
 file usr/share/locale/fr_FR/LC_MESSAGES/proftpd.mo \
     path=usr/share/locale/fr/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/it
-dir  path=usr/share/locale/it/LC_MESSAGES
 file usr/share/locale/it_IT/LC_MESSAGES/proftpd.mo \
     path=usr/share/locale/it/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/ja
-dir  path=usr/share/locale/ja/LC_MESSAGES
 file usr/share/locale/ja_JP/LC_MESSAGES/proftpd.mo \
     path=usr/share/locale/ja/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/ko
-dir  path=usr/share/locale/ko/LC_MESSAGES
 file usr/share/locale/ko_KR/LC_MESSAGES/proftpd.mo \
     path=usr/share/locale/ko/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/ru
-dir  path=usr/share/locale/ru/LC_MESSAGES
 file usr/share/locale/ru_RU/LC_MESSAGES/proftpd.mo \
     path=usr/share/locale/ru/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/zh_CN
-dir  path=usr/share/locale/zh_CN/LC_MESSAGES
 file path=usr/share/locale/zh_CN/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/locale/zh_TW
-dir  path=usr/share/locale/zh_TW/LC_MESSAGES
 file path=usr/share/locale/zh_TW/LC_MESSAGES/proftpd.mo
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
+#
+# man pages
+file path=usr/share/man/man1/ftpasswd.1
 file path=usr/share/man/man1/ftpcount.1
+file path=usr/share/man/man1/ftpmail.1
+file path=usr/share/man/man1/ftpquota.1
 file path=usr/share/man/man1/ftptop.1
 file path=usr/share/man/man1/ftpwho.1
-dir  path=usr/share/man/man4
-dir  path=usr/share/man/man5
 file path=usr/share/man/man5/proftpd.conf.5
 file path=usr/share/man/man5/xferlog.5
-dir  path=usr/share/man/man8
 file path=usr/share/man/man8/ftpdctl.8
 file path=usr/share/man/man8/ftpscrub.8
 file path=usr/share/man/man8/ftpshut.8
 file path=usr/share/man/man8/proftpd.8
+#
+# user/group (added by pkg)
 group groupname=ftp gid=21
 user username=ftp ftpuser=false gcos-field="FTPD Reserved UID" group=ftp uid=21
+#
+# pkg meta
 legacy pkg=SUNWftpu desc="FTP Server and Utilities" name="FTP Server, (Usr)"
 license proftpd.license license="GPLv2 (mod_gss)" \
     com.oracle.info.description="the ProFPTD GSS Engine" \
     com.oracle.info.name=mod_gss com.oracle.info.tpno=$(TPNO_MOD_GSS) \
-    com.oracle.info.version=1.3.6
+    com.oracle.info.version=$(COMPONENT_VERSION_1)
 license proftpd.license license="GPLv2 (proftpd)" \
     com.oracle.info.description="the ProFTPD server and utilities" \
     com.oracle.info.name=proftpd com.oracle.info.tpno=$(TPNO_PROFTPD) \
-    com.oracle.info.version=1.3.5
+    com.oracle.info.version=$(HUMAN_VERSION)