pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/54412 (Patch for codelite 13.0)



Hi,

Please see patch below for man location. My only concern that PLIST
will have static man location but Makefile will use ${PKGMANDIR}.
Should PLIST also be modified somehow?

Regards,
Andrius V

On Tue, Aug 27, 2019 at 5:35 PM Thomas Klausner <wiz%netbsd.org@localhost> wrote:
>
> The following reply was made to PR pkg/54412; it has been noted by GNATS.
>
> From: Thomas Klausner <wiz%NetBSD.org@localhost>
> To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
> Cc:
> Subject: Re: pkg/54412 (Patch for codelite 13.0)
> Date: Tue, 27 Aug 2019 16:33:15 +0200
>
>  On Tue, Aug 27, 2019 at 05:12:59PM +0300, Andrius V wrote:
>  > I added description to patches (attached the patch) but I am not sure
>  > how to change share/man to man. Is there any example on how I can
>  > change it?
>
>  Thanks for the patch.
>
>  Look for share/man in the CMakefile and add a SUBST block replacing it
>  with ${PKGMANDIR}.
>
>  Cheers,
>   Thomas
>
Index: editors/codelite/Makefile
==================================================================
--- editors/codelite/Makefile
+++ editors/codelite/Makefile
@@ -37,10 +37,16 @@
 SUBST_FILES.fix-bash+=		CodeLite/fileextmanager.cpp
 SUBST_FILES.fix-bash+=		Runtime/codelite_xterm
 SUBST_FILES.fix-bash+=		cmake/Modules/OSXInstall.cmake
 SUBST_SED.fix-bash+=		-e 's,/bin/bash,${BASH},g'
 
+SUBST_CLASSES+=			fix-man-path
+SUBST_STAGE.fix-man-path=	pre-configure
+SUBST_MESSAGE.fix-man-path=	Fix man path
+SUBST_FILES.fix-man-path=	LiteEditor/CMakeLists.txt
+SUBST_SED.fix-man-path+=	-e 's,${CL_PREFIX}/share/man,${CL_PREFIX}/${PKGMANDIR},g'
+
 REPLACE_BASH+=		Runtime/clg++
 REPLACE_BASH+=		Runtime/clgcc
 REPLACE_BASH+=		Runtime/codelite_xterm
 REPLACE_BASH+=		codelite-icons-dark/pack-icons.sh
 REPLACE_BASH+=		codelite-icons-fresh-farm/pack-icons.sh

Index: editors/codelite/PLIST
==================================================================
--- editors/codelite/PLIST
+++ editors/codelite/PLIST
@@ -54,10 +54,13 @@
 lib/codelite/libplugin.so
 lib/codelite/libwxshapeframework.so
 lib/codelite/libwxsqlite3.so
 lib/codelite/wxCrafter.so
 lib/codelite/wxFormBuilder.so
+man/man1/codelite-make.1
+man/man1/codelite.1
+man/man1/codelite_fix_files.1
 share/applications/codelite.desktop
 share/codelite/LICENSE
 share/codelite/PHP.zip
 share/codelite/astyle.sample
 share/codelite/codelite-bitmaps-dark.zip
@@ -305,8 +308,5 @@
 share/icons/hicolor/64x64/apps/codelite.png
 share/icons/hicolor/64x64@2x/apps/codelite.png
 share/locale/cs/LC_MESSAGES/codelite.mo
 share/locale/ru_RU/LC_MESSAGES/codelite.mo
 share/locale/zh_CN/LC_MESSAGES/codelite.mo
-share/man/man1/codelite-make.1
-share/man/man1/codelite.1
-share/man/man1/codelite_fix_files.1



Home | Main Index | Thread Index | Old Index