. Convert LIB_DEPENDS to the new format.

. Move MAN1 man pages to the packing list.
. Remove a @dirrmtry I didn't need.

2 files changed, 43 insertions, 19 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index f01b995f1e27..380928d12475 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -12,14 +12,14 @@ DISTNAME=	AfterStep-${PORTVERSION}
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	A stable version of the AfterStep window manager
 
-LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
-		execinfo:${PORTSDIR}/devel/libexecinfo \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype:${PORTSDIR}/print/freetype2 \
-		gif:${PORTSDIR}/graphics/giflib \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	xli:${PORTSDIR}/graphics/xli
 
 USES=		gmake pkgconfig shebangfix tar:bzip2
@@ -42,16 +42,6 @@ MAKE_ENV+=	HOME=-
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-devel-${PORTVERSION}
 
-MAN1=		ASDatabase.1x ASDatabaseEntry.1x AfterStep.1x Align.1x \
-		Animate.1x AnimateTypes.1x Arrange.1x AutoExec.1x \
-		BalloonContents.1x Base.1x Bevel.1x ColorScheme.1x \
-		Feel.1x FeelWindowBox.1x Functions.1x Gravity.1x Look.1x \
-		MyBackground.1x MyFrame.1x MyStyle.1x Pager.1x \
-		PagerDecorations.1x Placement.1x Sound.1x SoundEvents.1x \
-		SupportedHints.1x TbarLayout.1x Wharf.1x WharfFolders.1x \
-		WharfSounds.1x WinCommand.1x WinList.1x WinTabs.1x \
-		afterstep_faq.1x asimagexml.1x
-
 .if defined(WITH_DIFFERENT_LOOKNFEELS)
 CONFIGURE_ARGS+=	--enable-different-looknfeels
 .endif
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index a809a5fb6663..ea11a204ba2e 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -71,6 +71,41 @@ include/libAfterStep/wmprops.h
 lib/libASGTK.a
 lib/libAfterConf.a
 lib/libAfterStep.a
+man/man1/ASDatabase.1x.gz
+man/man1/ASDatabaseEntry.1x.gz
+man/man1/AfterStep.1x.gz
+man/man1/Align.1x.gz
+man/man1/Animate.1x.gz
+man/man1/AnimateTypes.1x.gz
+man/man1/Arrange.1x.gz
+man/man1/AutoExec.1x.gz
+man/man1/BalloonContents.1x.gz
+man/man1/Base.1x.gz
+man/man1/Bevel.1x.gz
+man/man1/ColorScheme.1x.gz
+man/man1/Feel.1x.gz
+man/man1/FeelWindowBox.1x.gz
+man/man1/Functions.1x.gz
+man/man1/Gravity.1x.gz
+man/man1/Look.1x.gz
+man/man1/MyBackground.1x.gz
+man/man1/MyFrame.1x.gz
+man/man1/MyStyle.1x.gz
+man/man1/Pager.1x.gz
+man/man1/PagerDecorations.1x.gz
+man/man1/Placement.1x.gz
+man/man1/Sound.1x.gz
+man/man1/SoundEvents.1x.gz
+man/man1/SupportedHints.1x.gz
+man/man1/TbarLayout.1x.gz
+man/man1/Wharf.1x.gz
+man/man1/WharfFolders.1x.gz
+man/man1/WharfSounds.1x.gz
+man/man1/WinCommand.1x.gz
+man/man1/WinList.1x.gz
+man/man1/WinTabs.1x.gz
+man/man1/afterstep_faq.1x.gz
+man/man1/asimagexml.1x.gz
 %%DATADIR%%/CREDITS
 %%DATADIR%%/animate
 %%DATADIR%%/applications/aboutinfo.desktop
@@ -1454,4 +1489,3 @@ share/applications/AfterStep.desktop
 @dirrm include/libAfterStep
 @dirrm include/libAfterConf
 @dirrm include/libASGTK
-@dirrmtry share/applications