Mon Nov 13 18:47:13 2023 UTC ()
vim-gtk2: remove support for (default-off) gnome option

Uses Gnome 2.


(wiz)
diff -r1.109 -r1.110 pkgsrc/editors/vim-gtk2/Makefile
cvs diff -r1.109 -r1.110 pkgsrc/editors/vim-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-gtk2/Makefile 2023/11/12 13:21:18 1.109
+++ pkgsrc/editors/vim-gtk2/Makefile 2023/11/13 18:47:13 1.110
@@ -1,54 +1,44 @@ @@ -1,54 +1,44 @@
1# $NetBSD: Makefile,v 1.109 2023/11/12 13:21:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.110 2023/11/13 18:47:13 wiz Exp $
2 2
3PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
4PKGREVISION= 4 4PKGREVISION= 4
5 5
6COMMENT= Vim editor (vi clone) with X11 GTK2 GUI 6COMMENT= Vim editor (vi clone) with X11 GTK2 GUI
7 7
8PKG_SUPPORTED_OPTIONS+= gnome 
9 
10.include "../../editors/vim-share/Makefile.common" 8.include "../../editors/vim-share/Makefile.common"
11 9
12 10
13DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 11DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
14CONFLICTS+= vim-[0-9]* vim-gtk3-[0-9]* vim-motif-[0-9]* 12CONFLICTS+= vim-[0-9]* vim-gtk3-[0-9]* vim-motif-[0-9]*
15 13
16CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 14CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
17 
18.if !empty(PKG_OPTIONS:Mgnome) 
19CONFIGURE_ARGS+= --enable-gui=gnome2 
20.else 
21CONFIGURE_ARGS+= --enable-gui=gtk2 15CONFIGURE_ARGS+= --enable-gui=gtk2
22.endif 
23 16
24USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
25 18
26BUILD_TARGET= vim 19BUILD_TARGET= vim
27INSTALL_TARGET= installvimbin installvimdiff installtutorbin 20INSTALL_TARGET= installvimbin installvimdiff installtutorbin
28 21
29INSTALLATION_DIRS+= ${PKGMANDIR}/man1 22INSTALLATION_DIRS+= ${PKGMANDIR}/man1
30 23
31CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 24CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1
32CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 25CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
33 26
34post-install: 27post-install:
35.for f in gvim.1 gview.1 rgvim.1 rgview.1 28.for f in gvim.1 gview.1 rgvim.1 rgview.1
36 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f} 29 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
37 ${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f} 30 ${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
38.endfor 31.endfor
39.for f in gvim gview rgvim rgview rvim rview 32.for f in gvim gview rgvim rgview rvim rview
40 ${RM} -f ${DESTDIR}${PREFIX}/bin/${f} 33 ${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
41 ${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f} 34 ${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
42.endfor 35.endfor
43 36
44.include "../../converters/libiconv/buildlink3.mk" 37.include "../../converters/libiconv/buildlink3.mk"
45.include "../../devel/gettext-lib/buildlink3.mk" 38.include "../../devel/gettext-lib/buildlink3.mk"
46.if !empty(PKG_OPTIONS:Mgnome) 
47. include "../../devel/libgnomeui/buildlink3.mk" 
48.endif 
49.include "../../x11/libXpm/buildlink3.mk" 39.include "../../x11/libXpm/buildlink3.mk"
50.include "../../x11/libXt/buildlink3.mk" 40.include "../../x11/libXt/buildlink3.mk"
51.include "../../x11/gtk2/buildlink3.mk" 41.include "../../x11/gtk2/buildlink3.mk"
52 42
53.include "../../mk/termcap.buildlink3.mk" 43.include "../../mk/termcap.buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"