- shift pkg-plist to Makefile directives

- pet portlint

2 files changed, 37 insertions, 35 deletions

diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index d238b56addc8..4c2258234768 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
-USES=		autoreconf compiler:c++11-lang gmake pkgconfig tar:bzip2 gnome
+USES=		autoreconf compiler:c++11-lang gmake pkgconfig tar:bzip2 gnome xorg
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
@@ -26,9 +26,45 @@ CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 PORTDOCS=	*
+PLIST_FILES=	\
+bin/xpad \
+man/man1/xpad.1.gz \
+share/applications/xpad.desktop \
+share/icons/hicolor/scalable/apps/xpad.svg \
+share/metainfo/xpad.appdata.xml \
+${DATADIR}/help/xpad-user-help.txt
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
+NLS_PLIST_FILES=	\
+share/locale/af/LC_MESSAGES/xpad.mo \
+share/locale/bg/LC_MESSAGES/xpad.mo \
+share/locale/cs/LC_MESSAGES/xpad.mo \
+share/locale/da/LC_MESSAGES/xpad.mo \
+share/locale/de/LC_MESSAGES/xpad.mo \
+share/locale/en_GB/LC_MESSAGES/xpad.mo \
+share/locale/es/LC_MESSAGES/xpad.mo \
+share/locale/et/LC_MESSAGES/xpad.mo \
+share/locale/fi/LC_MESSAGES/xpad.mo \
+share/locale/fr/LC_MESSAGES/xpad.mo \
+share/locale/ga/LC_MESSAGES/xpad.mo \
+share/locale/hr/LC_MESSAGES/xpad.mo \
+share/locale/hu/LC_MESSAGES/xpad.mo \
+share/locale/it/LC_MESSAGES/xpad.mo \
+share/locale/ja/LC_MESSAGES/xpad.mo \
+share/locale/ko/LC_MESSAGES/xpad.mo \
+share/locale/lv/LC_MESSAGES/xpad.mo \
+share/locale/nl/LC_MESSAGES/xpad.mo \
+share/locale/pt/LC_MESSAGES/xpad.mo \
+share/locale/ro/LC_MESSAGES/xpad.mo \
+share/locale/ru/LC_MESSAGES/xpad.mo \
+share/locale/rw/LC_MESSAGES/xpad.mo \
+share/locale/sv/LC_MESSAGES/xpad.mo \
+share/locale/th/LC_MESSAGES/xpad.mo \
+share/locale/tr/LC_MESSAGES/xpad.mo \
+share/locale/vi/LC_MESSAGES/xpad.mo \
+share/locale/zh_CN/LC_MESSAGES/xpad.mo \
+share/locale/zh_TW/LC_MESSAGES/xpad.mo
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
deleted file mode 100644
index aaff93f7fa15..000000000000
--- a/deskutils/xpad/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/xpad
-man/man1/xpad.1.gz
-share/applications/xpad.desktop
-share/icons/hicolor/scalable/apps/xpad.svg
-share/metainfo/xpad.appdata.xml
-%%DATADIR%%/help/xpad-user-help.txt
-%%NLS%%share/locale/af/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/da/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/de/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/es/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/et/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/it/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/th/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/xpad.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/xpad.mo