9 files changed, 245 insertions, 254 deletions

diff --git a/graphics/svgalib/Makefile b/graphics/svgalib/Makefile
index 2e1f15db986d..c971c7464f56 100644
--- a/graphics/svgalib/Makefile
+++ b/graphics/svgalib/Makefile
@@ -12,29 +12,20 @@ COMMENT=	A low level console graphics library
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-
 USE_DOS2UNIX=	utils/gtf/gtf.h utils/gtf/scitech.h
-USE_GMAKE=	yes
+USES=	gmake
 USE_LDCONFIG=	yes
-MANCOMPRESSED=	yes
 
 ALL_TARGET=	shared static
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
 MAKE_ENV=	NO_ASM=y
 .endif
 
-.for i in 1 2 3 4 5 6 7 8 9
-.if exists(${FILESDIR}/man${i})
-MAN${i}!=	${CAT} ${FILESDIR}/man${i}
-.endif
-.endfor
-
 post-patch: .SILENT
-	${MKDIR} ${WRKSRC}/include/linux
+	${MKDIR} ${STAGEDIR}${WRKSRC}/include/linux
 # Fix for GCC 4.1
 	${REINPLACE_CMD} -e '30d' ${WRKSRC}/src/vgabg.h
 	${REINPLACE_CMD} -e 's,^   (unsigned [[:alpha:]]*),,' \
@@ -45,8 +36,8 @@ post-patch: .SILENT
 	${FIND} ${WRKSRC}/doc -type f -name '*.[57].orig' -delete
 
 post-install:
-	@${MKDIR} ${PREFIX}/include/linux
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux
 	cd ${WRKSRC}/include/linux && \
-		${INSTALL_DATA} keyboard.h kd.h ${PREFIX}/include/linux
+		${INSTALL_DATA} keyboard.h kd.h ${STAGEDIR}${PREFIX}/include/linux
 
 .include <bsd.port.post.mk>
diff --git a/graphics/svgalib/files/man1 b/graphics/svgalib/files/man1
deleted file mode 100644
index a27d7ad25f2a..000000000000
--- a/graphics/svgalib/files/man1
+++ /dev/null
@@ -1,11 +0,0 @@
-convfont.1
-dumpreg.1
-fix132x43.1
-restorefont.1
-restorepalette.1
-restoretextmode.1
-runx.1
-savetextmode.1
-setmclk.1
-svgakeymap.1
-textmode.1
diff --git a/graphics/svgalib/files/man3 b/graphics/svgalib/files/man3
deleted file mode 100644
index 6363ee3c89c1..000000000000
--- a/graphics/svgalib/files/man3
+++ /dev/null
@@ -1,194 +0,0 @@
-currentcontext.3
-gl_allocatecontext.3
-gl_bcircle.3
-gl_circle.3
-gl_clearscreen.3
-gl_colorfont.3
-gl_compileboxmask.3
-gl_compiledboxmasksize.3
-gl_copybox.3
-gl_copyboxfromcontext.3
-gl_copyboxtocontext.3
-gl_copyscreen.3
-gl_disableclipping.3
-gl_enableclipping.3
-gl_enablepageflipping.3
-gl_expandfont.3
-gl_fillbox.3
-gl_fillcircle.3
-gl_font8x8.3
-gl_freecontext.3
-gl_getbox.3
-gl_getcontext.3
-gl_getpalette.3
-gl_getpalettecolor.3
-gl_getpalettecolors.3
-gl_getpixel.3
-gl_getpixelrgb.3
-gl_hline.3
-gl_line.3
-gl_printf.3
-gl_putbox.3
-gl_putboxmask.3
-gl_putboxmaskcompiled.3
-gl_putboxpart.3
-gl_rgbcolor.3
-gl_scalebox.3
-gl_setclippingwindow.3
-gl_setcontext.3
-gl_setcontextheight.3
-gl_setcontextvga.3
-gl_setcontextvgavirtual.3
-gl_setcontextvirtual.3
-gl_setcontextwidth.3
-gl_setdisplaystart.3
-gl_setfont.3
-gl_setfontcolors.3
-gl_setpalette.3
-gl_setpalettecolor.3
-gl_setpalettecolors.3
-gl_setpixel.3
-gl_setpixelrgb.3
-gl_setrgbpalette.3
-gl_setscreenoffset.3
-gl_setwritemode.3
-gl_striangle.3
-gl_swtriangle.3
-gl_triangle.3
-gl_trigetcolorlookup.3
-gl_trisetcolorlookup.3
-gl_trisetdrawpoint.3
-gl_write.3
-gl_writen.3
-gl_wtriangle.3
-graph_mem.3
-joystick_button1.3
-joystick_button2.3
-joystick_button3.3
-joystick_button4.3
-joystick_close.3
-joystick_getaxis.3
-joystick_getb1.3
-joystick_getb2.3
-joystick_getb3.3
-joystick_getb4.3
-joystick_getbutton.3
-joystick_getnumaxes.3
-joystick_getnumbuttons.3
-joystick_getx.3
-joystick_gety.3
-joystick_getz.3
-joystick_init.3
-joystick_setdefaulthandler.3
-joystick_sethandler.3
-joystick_update.3
-joystick_x.3
-joystick_y.3
-joystick_z.3
-keyboard_clearstate.3
-keyboard_close.3
-keyboard_getstate.3
-keyboard_init.3
-keyboard_init_return_fd.3
-keyboard_keypressed.3
-keyboard_setdefaulteventhandler.3
-keyboard_seteventhandler.3
-keyboard_translatekeys.3
-keyboard_update.3
-keyboard_waitforupdate.3
-mouse_close.3
-mouse_getbutton.3
-mouse_getcaps.3
-mouse_getposition_6d.3
-mouse_getx.3
-mouse_gety.3
-mouse_init.3
-mouse_init_return_fd.3
-mouse_setdefaulteventhandler.3
-mouse_seteventhandler.3
-mouse_setposition.3
-mouse_setposition_6d.3
-mouse_setrange_6d.3
-mouse_setscale.3
-mouse_setwrap.3
-mouse_setxrange.3
-mouse_setyrange.3
-mouse_update.3
-mouse_waitforupdate.3
-vga_accel.3
-vga_addmode.3
-vga_addtiming.3
-vga_bitblt.3
-vga_blitwait.3
-vga_changetiming.3
-vga_claimvideomemory.3
-vga_clear.3
-vga_copytoplanar16.3
-vga_copytoplanar256.3
-vga_copytoplane.3
-vga_disabledriverreport.3
-vga_drawline.3
-vga_drawpixel.3
-vga_drawscanline.3
-vga_drawscansegment.3
-vga_dumpregs.3
-vga_ext_set.3
-vga_fillblt.3
-vga_flip.3
-vga_getch.3
-vga_getcolors.3
-vga_getcurrentchipset.3
-vga_getcurrentmode.3
-vga_getcurrenttiming.3
-vga_getdefaultmode.3
-vga_getgraphmem.3
-vga_getkey.3
-vga_getmodeinfo.3
-vga_getmodename.3
-vga_getmodenumber.3
-vga_getmonitortype.3
-vga_getmousetype.3
-vga_getpalette.3
-vga_getpalvec.3
-vga_getpixel.3
-vga_getscansegment.3
-vga_gettextfont.3
-vga_gettextmoderegs.3
-vga_getxdim.3
-vga_getydim.3
-vga_guesstiming.3
-vga_hasmode.3
-vga_hlinelistblt.3
-vga_imageblt.3
-vga_init.3
-vga_lastmodenumber.3
-vga_lockvc.3
-vga_oktowrite.3
-vga_puttextfont.3
-vga_runinbackground.3
-vga_runinbackground_version.3
-vga_safety_fork.3
-vga_screenoff.3
-vga_screenon.3
-vga_setchipset.3
-vga_setchipsetandfeatures.3
-vga_setcolor.3
-vga_setdisplaystart.3
-vga_setegacolor.3
-vga_setflipchar.3
-vga_setlinearaddressing.3
-vga_setlogicalwidth.3
-vga_setmode.3
-vga_setmodeX.3
-vga_setmousesupport.3
-vga_setpage.3
-vga_setpalette.3
-vga_setpalvec.3
-vga_setreadpage.3
-vga_setrgbcolor.3
-vga_settextmoderegs.3
-vga_setwritepage.3
-vga_unlockvc.3
-vga_waitevent.3
-vga_waitretrace.3
-vga_white.3
diff --git a/graphics/svgalib/files/man5 b/graphics/svgalib/files/man5
deleted file mode 100644
index 43c9d4140516..000000000000
--- a/graphics/svgalib/files/man5
+++ /dev/null
@@ -1,3 +0,0 @@
-libvga.config.5
-libvga.et4000.5
-svgalibrc.5
diff --git a/graphics/svgalib/files/man6 b/graphics/svgalib/files/man6
deleted file mode 100644
index bc184c6d6c7a..000000000000
--- a/graphics/svgalib/files/man6
+++ /dev/null
@@ -1,23 +0,0 @@
-accel.6
-bg_test.6
-eventtest.6
-forktest.6
-fun.6
-joytest.6
-keytest.6
-lineart.6
-mach32info.6
-mjoytest.6
-mousetest.6
-plane.6
-printftest.6
-scrolltest.6
-speedtest.6
-spin.6
-svidtune.6
-testaccel.6
-testgl.6
-testlinear.6
-threed.6
-vgatest.6
-wrapdemo.6
diff --git a/graphics/svgalib/files/man7 b/graphics/svgalib/files/man7
deleted file mode 100644
index a949a20a215a..000000000000
--- a/graphics/svgalib/files/man7
+++ /dev/null
@@ -1,7 +0,0 @@
-svgalib.7
-svgalib.chips.7
-svgalib.et4000.7
-svgalib.faq.7
-svgalib.mach32.7
-threedkit.7
-vgagl.7
diff --git a/graphics/svgalib/files/man8 b/graphics/svgalib/files/man8
deleted file mode 100644
index 586c07744302..000000000000
--- a/graphics/svgalib/files/man8
+++ /dev/null
@@ -1 +0,0 @@
-mode3.8
diff --git a/graphics/svgalib/files/patch-aa b/graphics/svgalib/files/patch-aa
index 3cbc0294c043..681c63adeadd 100644
--- a/graphics/svgalib/files/patch-aa
+++ b/graphics/svgalib/files/patch-aa
@@ -17,8 +17,8 @@
  # NOTE: This directory must exist when you start the install.
 -TOPDIR=
 -prefix = $(TOPDIR)/usr/local
-+TOPDIR=$(PREFIX)
-+prefix = $(PREFIX)
++TOPDIR=$(DESTDIR)$(PREFIX)
++prefix = $(DESTDIR)$(PREFIX)
  exec_prefix = $(prefix)
  
  # Directory where the shared stubs and static library will be installed.
diff --git a/graphics/svgalib/pkg-plist b/graphics/svgalib/pkg-plist
index e7d15779bb99..2f1e43586355 100644
--- a/graphics/svgalib/pkg-plist
+++ b/graphics/svgalib/pkg-plist
@@ -22,5 +22,244 @@ lib/libvga.so.1
 lib/libvgagl.a
 lib/libvgagl.so
 lib/libvgagl.so.1
+man/man1/convfont.1.gz
+man/man1/dumpreg.1.gz
+man/man1/fix132x43.1.gz
+man/man1/restorefont.1.gz
+man/man1/restorepalette.1.gz
+man/man1/restoretextmode.1.gz
+man/man1/runx.1.gz
+man/man1/savetextmode.1.gz
+man/man1/setmclk.1.gz
+man/man1/svgakeymap.1.gz
+man/man1/textmode.1.gz
+man/man3/currentcontext.3.gz
+man/man3/gl_allocatecontext.3.gz
+man/man3/gl_bcircle.3.gz
+man/man3/gl_circle.3.gz
+man/man3/gl_clearscreen.3.gz
+man/man3/gl_colorfont.3.gz
+man/man3/gl_compileboxmask.3.gz
+man/man3/gl_compiledboxmasksize.3.gz
+man/man3/gl_copybox.3.gz
+man/man3/gl_copyboxfromcontext.3.gz
+man/man3/gl_copyboxtocontext.3.gz
+man/man3/gl_copyscreen.3.gz
+man/man3/gl_disableclipping.3.gz
+man/man3/gl_enableclipping.3.gz
+man/man3/gl_enablepageflipping.3.gz
+man/man3/gl_expandfont.3.gz
+man/man3/gl_fillbox.3.gz
+man/man3/gl_fillcircle.3.gz
+man/man3/gl_font8x8.3.gz
+man/man3/gl_freecontext.3.gz
+man/man3/gl_getbox.3.gz
+man/man3/gl_getcontext.3.gz
+man/man3/gl_getpalette.3.gz
+man/man3/gl_getpalettecolor.3.gz
+man/man3/gl_getpalettecolors.3.gz
+man/man3/gl_getpixel.3.gz
+man/man3/gl_getpixelrgb.3.gz
+man/man3/gl_hline.3.gz
+man/man3/gl_line.3.gz
+man/man3/gl_printf.3.gz
+man/man3/gl_putbox.3.gz
+man/man3/gl_putboxmask.3.gz
+man/man3/gl_putboxmaskcompiled.3.gz
+man/man3/gl_putboxpart.3.gz
+man/man3/gl_rgbcolor.3.gz
+man/man3/gl_scalebox.3.gz
+man/man3/gl_setclippingwindow.3.gz
+man/man3/gl_setcontext.3.gz
+man/man3/gl_setcontextheight.3.gz
+man/man3/gl_setcontextvga.3.gz
+man/man3/gl_setcontextvgavirtual.3.gz
+man/man3/gl_setcontextvirtual.3.gz
+man/man3/gl_setcontextwidth.3.gz
+man/man3/gl_setdisplaystart.3.gz
+man/man3/gl_setfont.3.gz
+man/man3/gl_setfontcolors.3.gz
+man/man3/gl_setpalette.3.gz
+man/man3/gl_setpalettecolor.3.gz
+man/man3/gl_setpalettecolors.3.gz
+man/man3/gl_setpixel.3.gz
+man/man3/gl_setpixelrgb.3.gz
+man/man3/gl_setrgbpalette.3.gz
+man/man3/gl_setscreenoffset.3.gz
+man/man3/gl_setwritemode.3.gz
+man/man3/gl_striangle.3.gz
+man/man3/gl_swtriangle.3.gz
+man/man3/gl_triangle.3.gz
+man/man3/gl_trigetcolorlookup.3.gz
+man/man3/gl_trisetcolorlookup.3.gz
+man/man3/gl_trisetdrawpoint.3.gz
+man/man3/gl_write.3.gz
+man/man3/gl_writen.3.gz
+man/man3/gl_wtriangle.3.gz
+man/man3/graph_mem.3.gz
+man/man3/joystick_button1.3.gz
+man/man3/joystick_button2.3.gz
+man/man3/joystick_button3.3.gz
+man/man3/joystick_button4.3.gz
+man/man3/joystick_close.3.gz
+man/man3/joystick_getaxis.3.gz
+man/man3/joystick_getb1.3.gz
+man/man3/joystick_getb2.3.gz
+man/man3/joystick_getb3.3.gz
+man/man3/joystick_getb4.3.gz
+man/man3/joystick_getbutton.3.gz
+man/man3/joystick_getnumaxes.3.gz
+man/man3/joystick_getnumbuttons.3.gz
+man/man3/joystick_getx.3.gz
+man/man3/joystick_gety.3.gz
+man/man3/joystick_getz.3.gz
+man/man3/joystick_init.3.gz
+man/man3/joystick_setdefaulthandler.3.gz
+man/man3/joystick_sethandler.3.gz
+man/man3/joystick_update.3.gz
+man/man3/joystick_x.3.gz
+man/man3/joystick_y.3.gz
+man/man3/joystick_z.3.gz
+man/man3/keyboard_clearstate.3.gz
+man/man3/keyboard_close.3.gz
+man/man3/keyboard_getstate.3.gz
+man/man3/keyboard_init.3.gz
+man/man3/keyboard_init_return_fd.3.gz
+man/man3/keyboard_keypressed.3.gz
+man/man3/keyboard_setdefaulteventhandler.3.gz
+man/man3/keyboard_seteventhandler.3.gz
+man/man3/keyboard_translatekeys.3.gz
+man/man3/keyboard_update.3.gz
+man/man3/keyboard_waitforupdate.3.gz
+man/man3/mouse_close.3.gz
+man/man3/mouse_getbutton.3.gz
+man/man3/mouse_getcaps.3.gz
+man/man3/mouse_getposition_6d.3.gz
+man/man3/mouse_getx.3.gz
+man/man3/mouse_gety.3.gz
+man/man3/mouse_init.3.gz
+man/man3/mouse_init_return_fd.3.gz
+man/man3/mouse_setdefaulteventhandler.3.gz
+man/man3/mouse_seteventhandler.3.gz
+man/man3/mouse_setposition.3.gz
+man/man3/mouse_setposition_6d.3.gz
+man/man3/mouse_setrange_6d.3.gz
+man/man3/mouse_setscale.3.gz
+man/man3/mouse_setwrap.3.gz
+man/man3/mouse_setxrange.3.gz
+man/man3/mouse_setyrange.3.gz
+man/man3/mouse_update.3.gz
+man/man3/mouse_waitforupdate.3.gz
+man/man3/vga_accel.3.gz
+man/man3/vga_addmode.3.gz
+man/man3/vga_addtiming.3.gz
+man/man3/vga_bitblt.3.gz
+man/man3/vga_blitwait.3.gz
+man/man3/vga_changetiming.3.gz
+man/man3/vga_claimvideomemory.3.gz
+man/man3/vga_clear.3.gz
+man/man3/vga_copytoplanar16.3.gz
+man/man3/vga_copytoplanar256.3.gz
+man/man3/vga_copytoplane.3.gz
+man/man3/vga_disabledriverreport.3.gz
+man/man3/vga_drawline.3.gz
+man/man3/vga_drawpixel.3.gz
+man/man3/vga_drawscanline.3.gz
+man/man3/vga_drawscansegment.3.gz
+man/man3/vga_dumpregs.3.gz
+man/man3/vga_ext_set.3.gz
+man/man3/vga_fillblt.3.gz
+man/man3/vga_flip.3.gz
+man/man3/vga_getch.3.gz
+man/man3/vga_getcolors.3.gz
+man/man3/vga_getcurrentchipset.3.gz
+man/man3/vga_getcurrentmode.3.gz
+man/man3/vga_getcurrenttiming.3.gz
+man/man3/vga_getdefaultmode.3.gz
+man/man3/vga_getgraphmem.3.gz
+man/man3/vga_getkey.3.gz
+man/man3/vga_getmodeinfo.3.gz
+man/man3/vga_getmodename.3.gz
+man/man3/vga_getmodenumber.3.gz
+man/man3/vga_getmonitortype.3.gz
+man/man3/vga_getmousetype.3.gz
+man/man3/vga_getpalette.3.gz
+man/man3/vga_getpalvec.3.gz
+man/man3/vga_getpixel.3.gz
+man/man3/vga_getscansegment.3.gz
+man/man3/vga_gettextfont.3.gz
+man/man3/vga_gettextmoderegs.3.gz
+man/man3/vga_getxdim.3.gz
+man/man3/vga_getydim.3.gz
+man/man3/vga_guesstiming.3.gz
+man/man3/vga_hasmode.3.gz
+man/man3/vga_hlinelistblt.3.gz
+man/man3/vga_imageblt.3.gz
+man/man3/vga_init.3.gz
+man/man3/vga_lastmodenumber.3.gz
+man/man3/vga_lockvc.3.gz
+man/man3/vga_oktowrite.3.gz
+man/man3/vga_puttextfont.3.gz
+man/man3/vga_runinbackground.3.gz
+man/man3/vga_runinbackground_version.3.gz
+man/man3/vga_safety_fork.3.gz
+man/man3/vga_screenoff.3.gz
+man/man3/vga_screenon.3.gz
+man/man3/vga_setchipset.3.gz
+man/man3/vga_setchipsetandfeatures.3.gz
+man/man3/vga_setcolor.3.gz
+man/man3/vga_setdisplaystart.3.gz
+man/man3/vga_setegacolor.3.gz
+man/man3/vga_setflipchar.3.gz
+man/man3/vga_setlinearaddressing.3.gz
+man/man3/vga_setlogicalwidth.3.gz
+man/man3/vga_setmode.3.gz
+man/man3/vga_setmodeX.3.gz
+man/man3/vga_setmousesupport.3.gz
+man/man3/vga_setpage.3.gz
+man/man3/vga_setpalette.3.gz
+man/man3/vga_setpalvec.3.gz
+man/man3/vga_setreadpage.3.gz
+man/man3/vga_setrgbcolor.3.gz
+man/man3/vga_settextmoderegs.3.gz
+man/man3/vga_setwritepage.3.gz
+man/man3/vga_unlockvc.3.gz
+man/man3/vga_waitevent.3.gz
+man/man3/vga_waitretrace.3.gz
+man/man3/vga_white.3.gz
+man/man5/libvga.config.5.gz
+man/man5/libvga.et4000.5.gz
+man/man5/svgalibrc.5.gz
+man/man6/accel.6.gz
+man/man6/bg_test.6.gz
+man/man6/eventtest.6.gz
+man/man6/forktest.6.gz
+man/man6/fun.6.gz
+man/man6/joytest.6.gz
+man/man6/keytest.6.gz
+man/man6/lineart.6.gz
+man/man6/mach32info.6.gz
+man/man6/mjoytest.6.gz
+man/man6/mousetest.6.gz
+man/man6/plane.6.gz
+man/man6/printftest.6.gz
+man/man6/scrolltest.6.gz
+man/man6/speedtest.6.gz
+man/man6/spin.6.gz
+man/man6/svidtune.6.gz
+man/man6/testaccel.6.gz
+man/man6/testgl.6.gz
+man/man6/testlinear.6.gz
+man/man6/threed.6.gz
+man/man6/vgatest.6.gz
+man/man6/wrapdemo.6.gz
+man/man7/svgalib.7.gz
+man/man7/svgalib.chips.7.gz
+man/man7/svgalib.et4000.7.gz
+man/man7/svgalib.faq.7.gz
+man/man7/svgalib.mach32.7.gz
+man/man7/threedkit.7.gz
+man/man7/vgagl.7.gz
+man/man8/mode3.8.gz
 @dirrm include/linux
 @dirrm etc/vga