diff options
| author | joerg <joerg@pkgsrc.org> | 2008-10-02 14:33:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-10-02 14:33:58 +0000 |
| commit | 7a6012dccf17a4977a620d974264a69757d2c9ac (patch) | |
| tree | 611d05e77cf04a6725142cb43caf435d3beeba42 | |
| parent | c26d5bd3e9c50d8f5d8af70aa12168f59cdd01ed (diff) | |
| download | pkgsrc-7a6012dccf17a4977a620d974264a69757d2c9ac.tar.gz | |
Fix build. Add DESTDIR support.
| -rw-r--r-- | misc/vfu/Makefile | 6 | ||||
| -rw-r--r-- | misc/vfu/distinfo | 4 | ||||
| -rw-r--r-- | misc/vfu/patches/patch-ak | 13 | ||||
| -rw-r--r-- | misc/vfu/patches/patch-al | 20 |
4 files changed, 40 insertions, 3 deletions
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile index 09fb38b297c..dfdb34b6480 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2008/03/04 19:21:12 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2008/10/02 14:33:58 joerg Exp $ # DISTNAME= vfu-3.04 @@ -28,11 +28,13 @@ CONF_FILES= ${EGDIR}/vfu.conf ${PKG_SYSCONFDIR}/vfu.conf MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} +INSTALLATION_DIRS= bin man/man1 + do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} build.netbsd do-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} install + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} PREFIX=${DESTDIR}${PREFIX} ${SH} install post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} ${DESTDIR}${EGDIR} diff --git a/misc/vfu/distinfo b/misc/vfu/distinfo index 5989933d370..cebc50f1036 100644 --- a/misc/vfu/distinfo +++ b/misc/vfu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2006/01/11 17:02:39 joerg Exp $ +$NetBSD: distinfo,v 1.10 2008/10/02 14:33:58 joerg Exp $ SHA1 (vfu-3.04.src.tar.gz) = 75e87d102114dc08136420e7927e687f72a52dfd RMD160 (vfu-3.04.src.tar.gz) = a0d1ba84d9c66216b444226ceace190ada0e795a @@ -13,3 +13,5 @@ SHA1 (patch-ag) = 3e87916630a0e9628cc28097bf2d011d15fadc42 SHA1 (patch-ah) = 50b211c8ca93393f38ed7e279795e1df0606884c SHA1 (patch-ai) = 4a161a1df84001bdefc81384128ea74bf9d7f61d SHA1 (patch-aj) = 265fbb0873ce0b910ba6a53da57a18269af34b82 +SHA1 (patch-ak) = cfcfb94f1ba6169ef471ae47fdcd9ccc81196a39 +SHA1 (patch-al) = bd947171f2027243bebe889c537426124459e2e1 diff --git a/misc/vfu/patches/patch-ak b/misc/vfu/patches/patch-ak new file mode 100644 index 00000000000..5e97f727a98 --- /dev/null +++ b/misc/vfu/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2008/10/02 14:33:58 joerg Exp $ + +--- vslib/conmenu.cpp.orig 2008-10-02 15:59:42.000000000 +0200 ++++ vslib/conmenu.cpp +@@ -172,7 +172,7 @@ int con_menu_box( int x, int y, const ch + { + for(z = 0; z < va->count(); z++) + if (strncmp("--", va->get(z), 2)) +- str_add_ch( hots,int((const char*)(va->get(z))[hotkeys]) ); ++ str_add_ch( hots,int((size_t)(const char*)(va->get(z))[hotkeys]) ); + else + str_add_ch( hots,' ' ); + str_up(hots); diff --git a/misc/vfu/patches/patch-al b/misc/vfu/patches/patch-al new file mode 100644 index 00000000000..45611f242d1 --- /dev/null +++ b/misc/vfu/patches/patch-al @@ -0,0 +1,20 @@ +$NetBSD: patch-al,v 1.1 2008/10/02 14:33:58 joerg Exp $ + +--- vslib/getopt2.h.orig 2008-10-02 16:00:52.000000000 +0200 ++++ vslib/getopt2.h +@@ -15,7 +15,7 @@ + /* next line added by <cade@biscom.net> see getopt2.cpp for changes */ + #define GETOPT(opts) while((optc = getopt2(argc, argv, opts)) != -1) + +- ++extern "C" { + extern char *optarg; + extern int optind; + extern int opterr; +@@ -32,4 +32,6 @@ extern int opterr_report; + + int getopt2(int argc, char *argv[], char *optstring); + ++} ++ + #endif |