2 files changed, 157 insertions, 97 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 8f2dd1ccc480..bcbd8ca4f9af 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -24,104 +24,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 LDFLAGS+=	${PTHREAD_LIBS}
 
-MAN1=		cube3d.1 ggi-demo.1 ggiteleserver.1 monitest.1
-MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
-		ggiDBGetNumBuffers.3 ggiDrawBox.3 ggiDrawHLine.3 \
-		ggiDrawLine.3 ggiDrawPixel.3 ggiDrawVLine.3 \
-		ggiEventSend.3 ggiFillscreen.3 ggiFlush.3 \
-		ggiGetGamma.3 ggiGetInput.3 ggiGetPixelFormat.3 \
-		ggiGetc.3 ggiInit.3 ggiJoinInputs.3 \
-		ggiMapColor.3 \
-		ggiOpen.3 ggiPanic.3 ggiParseMode.3 \
-		ggiPutc.3 ggiResourceAcquire.3 ggiSetColorfulPalette.3 \
-		ggiSetDisplayFrame.3 ggiSetFlags.3 ggiSetGCClipping.3 \
-		ggiSetGCForeground.3 ggiSetMode.3 ggiSetOrigin.3 \
-		ggiSetPalette.3 ggiSetTextMode.3 \
-		ggi_color.3 ggi_colormap.3 \
-		ggi_directbuffer.3 ggi_mode.3 ggi_pixelformat.3 \
-		ggidev-add_3.3 \
-		ggidev-assign_3.3 \
-		ggidev-eq_3.3 \
-		ggidev-inc_3.3 \
-		ggidev-invert_3.3 \
-		ggidev-sign_3.3
-MAN7=		libggi.7 display-aa.7 display-auto.7 \
-		display-directx.7 \
-		display-fbdev.7 display-file.7 display-glide.7 \
-		display-mansync.7 display-memory.7 display-monotext.7 \
-		display-multi.7 display-palemu.7 \
-		display-quartz.7 display-sub.7 \
-		display-svgalib.7 display-tele.7 display-terminfo.7 \
-		display-tile.7 display-trueemu.7 \
-		display-vcsa.7 display-vgl.7 display-x.7 \
-		ggidev-triple-int.7
-MLINKS=		ggi-demo.1 demo.1 \
-		display-directx.7 display-directxnt.7 \
-		ggiCheckMode.3 ggiCheckGraphMode.3 - ggiCheckSimpleMode.3 \
-		- ggiCheckTextMode.3 ggiDBGetNumBuffers.3 ggiDBGetBuffer.3 \
-		ggiDrawBox.3 ggiGetBox.3 - ggiPutBox.3 \
-		ggiDrawHLine.3 ggiGetHLine.3 - ggiPutHLine.3 \
-		ggiDrawPixel.3 ggiGetPixel.3 - ggiPutPixel.3 \
-		ggiDrawVLine.3 ggiGetVLine.3 - ggiPutVLine.3 \
-		ggiFlush.3 ggiFlushRegion.3 \
-		ggiGetGamma.3 ggiGammaMax.3 - ggiGetGammaMap.3 \
-		- ggiSetGamma.3 - ggiSetGammaMap.3 \
-		ggiGetInput.3 ggiDetachInput.3 \
-		ggiGetc.3 ggiKbhit.3 \
-		ggiInit.3 ggiExit.3 \
-		ggiJoinInputs.3 ggiAddEventMask.3 - ggiEventPoll.3 \
-		- ggiEventRead.3 \
-		ggiJoinInputs.3 ggiEventSelect.3 - ggiEventsQueued.3 \
-		- ggiGetEventMask.3 - ggiRemoveEventMask.3 \
-		- ggiSetEventMask.3 \
-		ggiMapColor.3 ggiPackColors.3 - ggiUnmapPixel.3 \
-		- ggiUnpackPixels.3 ggiOpen.3 ggiClose.3 \
-		ggiParseMode.3 ggiFPrintMode.3 - ggiPrintMode.3 \
-		- ggiSPrintMode.3 ggiPutc.3 ggiGetCharSize.3 \
-		- ggiPuts.3 ggiResourceAcquire.3 ggiResourceMustAcquire.3 \
-		- ggiResourceRelease.3 \
-		ggiSetDisplayFrame.3 ggiGetDisplayFrame.3 - ggiGetReadFrame.3 \
-		ggiSetDisplayFrame.3 ggiGetWriteFrame.3 - ggiSetReadFrame.3 \
-		- ggiSetWriteFrame.3 \
-		ggiSetFlags.3 ggiAddFlags.3 - ggiGetFlags.3 \
-		- ggiRemoveFlags.3 \
-		ggiSetGCClipping.3 ggiGetGCClipping.3 \
-		ggiSetGCForeground.3 ggiGetGCBackground.3 \
-		- ggiGetGCForeground.3 - ggiSetGCBackground.3 \
-		ggiSetMode.3 ggiGetMode.3 \
-		ggiSetOrigin.3 ggiGetOrigin.3 \
-		ggiSetPalette.3 ggiGetPalette.3 \
-		ggiSetTextMode.3 ggiSetGraphMode.3 - ggiSetSimpleMode.3 \
-		ggi_color.3 ggi_pixel.3 \
-		ggi_colormap.3 ggi_colormap_region.3 \
-		ggi_directbuffer.3 ggi_pixellinearbuffer.3 \
-		- ggi_pixelplanarbuffer.3 - ggi_samplelinearbuffer.3 \
-		- ggi_sampleplanarbuffer.3 \
-		ggi_mode.3 ggi_coord.3 - ggi_graphtype.3 \
-		ggidev-add_3.3 ggidev-divmod_3.3 \
-		- ggidev-mul_3.3 \
-		- ggidev-sub_3.3 \
-		ggidev-assign_3.3 ggidev-assign_int_3.3 \
-		- ggidev-assign_unsigned_3.3 \
-		ggidev-eq_3.3 ggidev-ge_3.3 \
-		ggidev-inc_3.3 ggidev-abs_3.3 \
-		- ggidev-dec_3.3 \
-		- ggidev-negate_3.3 \
-		ggidev-invert_3.3 ggidev-lshift_3.3 \
-		- ggidev-rshift_3.3 \
-		ggidev-sign_3.3 ggidev-bits_3.3 \
-		- ggidev-eq0_3.3 \
-		- ggidev-ge0_3.3 \
-		- ggidev-gt0_3.3 \
-		- ggidev-le0_3.3 \
-		- ggidev-lt0_3.3
-
 CONFIGURE_ARGS=	--disable-directfb
 
 OPTIONS_DEFINE=	AALIB SVGALIB X11
 OPTIONS_DEFAULT=X11
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if exists(/usr/include/dev/kgi/kgi.h)
@@ -164,9 +71,9 @@ PLIST_SUB+=	WITH_SVGALIB="@comment "
 .endif
 
 post-install:
-	${TOUCH} ${PREFIX}/lib/ggi/default/fbdev/.keep
-	${TOUCH} ${PREFIX}/lib/ggi/default/kgi/.keep
-	${TOUCH} ${PREFIX}/lib/ggi/helper/.keep
-	${INSTALL_DATA} ${WRKSRC}/libggi.conf ${PREFIX}/etc/ggi/libggi.conf.dist
+	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/fbdev/.keep
+	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/kgi/.keep
+	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/helper/.keep
+	${INSTALL_DATA} ${WRKSRC}/libggi.conf ${STAGEDIR}${PREFIX}/etc/ggi/libggi.conf.dist
 
 .include <bsd.port.mk>
diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist
index 5dd6e36d9f3d..b9d51a4d9bcd 100644
--- a/graphics/libggi/pkg-plist
+++ b/graphics/libggi/pkg-plist
@@ -136,6 +136,159 @@ lib/libggi.a
 lib/libggi.la
 lib/libggi.so
 lib/libggi.so.2
+man/man1/cube3d.1.gz
+man/man1/demo.1.gz
+man/man1/ggi-demo.1.gz
+man/man1/ggiteleserver.1.gz
+man/man1/monitest.1.gz
+man/man3/ggiAddEventMask.3.gz
+man/man3/ggiAddFlags.3.gz
+man/man3/ggiCheckGraphMode.3.gz
+man/man3/ggiCheckMode.3.gz
+man/man3/ggiCheckSimpleMode.3.gz
+man/man3/ggiCheckTextMode.3.gz
+man/man3/ggiClose.3.gz
+man/man3/ggiCopyBox.3.gz
+man/man3/ggiCrossBlit.3.gz
+man/man3/ggiDBGetBuffer.3.gz
+man/man3/ggiDBGetNumBuffers.3.gz
+man/man3/ggiDetachInput.3.gz
+man/man3/ggiDrawBox.3.gz
+man/man3/ggiDrawHLine.3.gz
+man/man3/ggiDrawLine.3.gz
+man/man3/ggiDrawPixel.3.gz
+man/man3/ggiDrawVLine.3.gz
+man/man3/ggiEventPoll.3.gz
+man/man3/ggiEventRead.3.gz
+man/man3/ggiEventSelect.3.gz
+man/man3/ggiEventSend.3.gz
+man/man3/ggiEventsQueued.3.gz
+man/man3/ggiExit.3.gz
+man/man3/ggiFPrintMode.3.gz
+man/man3/ggiFillscreen.3.gz
+man/man3/ggiFlush.3.gz
+man/man3/ggiFlushRegion.3.gz
+man/man3/ggiGammaMax.3.gz
+man/man3/ggiGetBox.3.gz
+man/man3/ggiGetCharSize.3.gz
+man/man3/ggiGetDisplayFrame.3.gz
+man/man3/ggiGetEventMask.3.gz
+man/man3/ggiGetFlags.3.gz
+man/man3/ggiGetGCBackground.3.gz
+man/man3/ggiGetGCClipping.3.gz
+man/man3/ggiGetGCForeground.3.gz
+man/man3/ggiGetGamma.3.gz
+man/man3/ggiGetGammaMap.3.gz
+man/man3/ggiGetHLine.3.gz
+man/man3/ggiGetInput.3.gz
+man/man3/ggiGetMode.3.gz
+man/man3/ggiGetOrigin.3.gz
+man/man3/ggiGetPalette.3.gz
+man/man3/ggiGetPixel.3.gz
+man/man3/ggiGetPixelFormat.3.gz
+man/man3/ggiGetReadFrame.3.gz
+man/man3/ggiGetVLine.3.gz
+man/man3/ggiGetWriteFrame.3.gz
+man/man3/ggiGetc.3.gz
+man/man3/ggiInit.3.gz
+man/man3/ggiJoinInputs.3.gz
+man/man3/ggiKbhit.3.gz
+man/man3/ggiMapColor.3.gz
+man/man3/ggiOpen.3.gz
+man/man3/ggiPackColors.3.gz
+man/man3/ggiPanic.3.gz
+man/man3/ggiParseMode.3.gz
+man/man3/ggiPrintMode.3.gz
+man/man3/ggiPutBox.3.gz
+man/man3/ggiPutHLine.3.gz
+man/man3/ggiPutPixel.3.gz
+man/man3/ggiPutVLine.3.gz
+man/man3/ggiPutc.3.gz
+man/man3/ggiPuts.3.gz
+man/man3/ggiRemoveEventMask.3.gz
+man/man3/ggiRemoveFlags.3.gz
+man/man3/ggiResourceAcquire.3.gz
+man/man3/ggiResourceMustAcquire.3.gz
+man/man3/ggiResourceRelease.3.gz
+man/man3/ggiSPrintMode.3.gz
+man/man3/ggiSetColorfulPalette.3.gz
+man/man3/ggiSetDisplayFrame.3.gz
+man/man3/ggiSetEventMask.3.gz
+man/man3/ggiSetFlags.3.gz
+man/man3/ggiSetGCBackground.3.gz
+man/man3/ggiSetGCClipping.3.gz
+man/man3/ggiSetGCForeground.3.gz
+man/man3/ggiSetGamma.3.gz
+man/man3/ggiSetGammaMap.3.gz
+man/man3/ggiSetGraphMode.3.gz
+man/man3/ggiSetMode.3.gz
+man/man3/ggiSetOrigin.3.gz
+man/man3/ggiSetPalette.3.gz
+man/man3/ggiSetReadFrame.3.gz
+man/man3/ggiSetSimpleMode.3.gz
+man/man3/ggiSetTextMode.3.gz
+man/man3/ggiSetWriteFrame.3.gz
+man/man3/ggiUnmapPixel.3.gz
+man/man3/ggiUnpackPixels.3.gz
+man/man3/ggi_color.3.gz
+man/man3/ggi_colormap.3.gz
+man/man3/ggi_colormap_region.3.gz
+man/man3/ggi_coord.3.gz
+man/man3/ggi_directbuffer.3.gz
+man/man3/ggi_graphtype.3.gz
+man/man3/ggi_mode.3.gz
+man/man3/ggi_pixel.3.gz
+man/man3/ggi_pixelformat.3.gz
+man/man3/ggi_pixellinearbuffer.3.gz
+man/man3/ggi_pixelplanarbuffer.3.gz
+man/man3/ggi_samplelinearbuffer.3.gz
+man/man3/ggi_sampleplanarbuffer.3.gz
+man/man3/ggidev-abs_3.3.gz
+man/man3/ggidev-add_3.3.gz
+man/man3/ggidev-assign_3.3.gz
+man/man3/ggidev-assign_int_3.3.gz
+man/man3/ggidev-assign_unsigned_3.3.gz
+man/man3/ggidev-bits_3.3.gz
+man/man3/ggidev-dec_3.3.gz
+man/man3/ggidev-divmod_3.3.gz
+man/man3/ggidev-eq0_3.3.gz
+man/man3/ggidev-eq_3.3.gz
+man/man3/ggidev-ge0_3.3.gz
+man/man3/ggidev-ge_3.3.gz
+man/man3/ggidev-gt0_3.3.gz
+man/man3/ggidev-inc_3.3.gz
+man/man3/ggidev-invert_3.3.gz
+man/man3/ggidev-le0_3.3.gz
+man/man3/ggidev-lshift_3.3.gz
+man/man3/ggidev-lt0_3.3.gz
+man/man3/ggidev-mul_3.3.gz
+man/man3/ggidev-negate_3.3.gz
+man/man3/ggidev-rshift_3.3.gz
+man/man3/ggidev-sign_3.3.gz
+man/man3/ggidev-sub_3.3.gz
+man/man7/display-aa.7.gz
+man/man7/display-auto.7.gz
+man/man7/display-directx.7.gz
+man/man7/display-fbdev.7.gz
+man/man7/display-file.7.gz
+man/man7/display-glide.7.gz
+man/man7/display-mansync.7.gz
+man/man7/display-memory.7.gz
+man/man7/display-monotext.7.gz
+man/man7/display-multi.7.gz
+man/man7/display-palemu.7.gz
+man/man7/display-quartz.7.gz
+man/man7/display-sub.7.gz
+man/man7/display-svgalib.7.gz
+man/man7/display-tele.7.gz
+man/man7/display-terminfo.7.gz
+man/man7/display-tile.7.gz
+man/man7/display-trueemu.7.gz
+man/man7/display-vcsa.7.gz
+man/man7/display-vgl.7.gz
+man/man7/display-x.7.gz
+man/man7/ggidev-triple-int.7.gz
+man/man7/libggi.7.gz
 @dirrm include/ggi/display
 @dirrm lib/ggi/default/fbdev
 @dirrm lib/ggi/default/kgi