Attachment 223970 Details for Bug 254934 – patch

[patch] patch

fltk.patch (text/plain), 3.51 KB, created by Yuri Victorovich on 2021-04-10 03:52:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2021-04-10 03:52:16 UTC

Size: 3.51 KB

patch

obsolete

>diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
>index 0f4c2d49c2f9..3a4d678400a8 100644
>--- a/x11-toolkits/fltk/Makefile
>+++ b/x11-toolkits/fltk/Makefile
>@@ -1,7 +1,9 @@
> # Created by: Dima Sivachenko <dima@Chg.RU>
>+# $FreeBSD$
> 
> PORTNAME=	fltk
> PORTVERSION=	1.3.5
>+PORTREVISION=	1
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	https://www.fltk.org/pub/${PORTNAME}/${PORTVERSION}/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-source
>@@ -15,19 +17,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libpng.so:graphics/png \
> 		libfontconfig.so:x11-fonts/fontconfig
> 
>-USES=		gl jpeg localbase pkgconfig tar:bz2 xorg
>-USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
>+USES=		cmake desktop-file-utils gl jpeg localbase pkgconfig shared-mime-info tar:bz2 xorg
>+USE_XORG=	ice sm x11 xcursor xext xfixes xft xinerama xrender
> USE_GL=		gl glu
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-shared
>-CONFIGURE_ENV=	NROFF=echo
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-
>-PORTEXAMPLES=	*
>+CMAKE_ON=	OPTION_BUILD_SHARED_LIBS
> 
>-OPTIONS_DEFINE=	EXAMPLES
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> post-extract:
> 	@${MV} ${WRKSRC}/test/help.cxx ${WRKSRC}/test/help_dialog.cxx
>@@ -37,18 +34,11 @@ post-patch: .SILENT
> 	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
> 	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
> 		${WRKSRC}/src/Fl_Preferences.cxx
>-	${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \
>-		${WRKSRC}/test/Makefile
>-	${REINPLACE_CMD} -e '/^INSTALL_BIN/s,-m,${STRIP} &, ; \
>-		s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in
>-	${REINPLACE_CMD} -E \
>-		's,(.*)LDFLAGS(.*)LINKSHARED(.*),\1LINKSHARED\2LDFLAGS\3,' \
>-			${WRKSRC}/fluid/Makefile
>-
>-post-install:
>-.for x in fltk fltk_forms fltk_gl fltk_images
>-	${LN} -sf lib${x}.so.${PORTVERSION:R} \
>-		${STAGEDIR}${PREFIX}/lib/lib${x}.so.1
>-.endfor
>+
>+post-install: # remove stray files
>+	@cd ${STAGEDIR}${PREFIX} && ${RM} \
>+		include/FL/Fl_Check_Browser.H.orig \
>+		include/FL/Makefile.in \
>+		include/FL/README.Xcode
> 
> .include <bsd.port.mk>
>diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
>index 6f15df0e1435..8311b37962d2 100644
>--- a/x11-toolkits/fltk/pkg-plist
>+++ b/x11-toolkits/fltk/pkg-plist
>@@ -146,21 +146,35 @@ include/FL/platform.H
> include/FL/win32.H
> include/FL/x.H
> lib/libfltk.a
>-lib/libfltk.so
>-lib/libfltk.so.1
>-lib/libfltk.so.1.3
>+lib/libfltk_SHARED.so
>+lib/libfltk_SHARED.so.1.3
>+lib/libfltk_SHARED.so.1.3.5
> lib/libfltk_forms.a
>-lib/libfltk_forms.so
>-lib/libfltk_forms.so.1
>-lib/libfltk_forms.so.1.3
>+lib/libfltk_forms_SHARED.so
>+lib/libfltk_forms_SHARED.so.1.3
>+lib/libfltk_forms_SHARED.so.1.3.5
> lib/libfltk_gl.a
>-lib/libfltk_gl.so
>-lib/libfltk_gl.so.1
>-lib/libfltk_gl.so.1.3
>+lib/libfltk_gl_SHARED.so
>+lib/libfltk_gl_SHARED.so.1.3
>+lib/libfltk_gl_SHARED.so.1.3.5
> lib/libfltk_images.a
>-lib/libfltk_images.so
>-lib/libfltk_images.so.1
>-lib/libfltk_images.so.1.3
>+lib/libfltk_images_SHARED.so
>+lib/libfltk_images_SHARED.so.1.3
>+lib/libfltk_images_SHARED.so.1.3.5
> man/man1/fltk-config.1.gz
> man/man1/fluid.1.gz
> man/man3/fltk.3.gz
>+man/man6/blocks.6.gz
>+man/man6/checkers.6.gz
>+man/man6/sudoku.6.gz
>+share/applications/fluid.desktop
>+%%DATADIR%%/FLTK-Functions.cmake
>+%%DATADIR%%/FLTK-Targets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%DATADIR%%/FLTK-Targets.cmake
>+%%DATADIR%%/FLTKConfig.cmake
>+%%DATADIR%%/UseFLTK.cmake
>+share/icons/hicolor/128x128/apps/fluid.png
>+share/icons/hicolor/32x32/apps/fluid.png
>+share/icons/hicolor/48x48/apps/fluid.png
>+share/icons/hicolor/64x64/apps/fluid.png
>+share/mime/packages/fluid.xml

Actions: View | Diff

Attachments on bug 254934: 223970 | 226685