Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Framework: partially sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2022-03-23 20:13:16 +01:00
parent dfe2329e17
commit 80b1f4d954
7 changed files with 28 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Keywords/fcfontsdir.ucl
View file

@ -1,27 +0,0 @@
# MAINTAINER: x11@FreeBSD.org
actions: [dir]
post-install: <<EOD
case "%@" in
/*) fontsdir="%@" ;;
*) fontsdir="%D/%@" ;;
esac
fc-cache -fs ${fontsdir} 2>/dev/null || true
mkfontscale ${fontsdir} 2>/dev/null || true
mkfontdir ${fontsdir} 2>/dev/null || true
EOD
post-deinstall: <<EOD
case "%@" in
/*) fontsdir="%@" ;;
*) fontsdir="%D/%@" ;;
esac
fc-cache -fs ${fontsdir} 2>/dev/null || true
mkfontscale ${fontsdir} 2>/dev/null || true
if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then
rm ${fontsdir}/fonts.scale
fi
mkfontdir ${fontsdir} 2>/dev/null || true
if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then
rm ${fontsdir}/fonts.dir
fi
EOD

34
Keywords/fontsdir.ucl
View file

@ -1,25 +1,19 @@
# MAINTAINER: x11@FreeBSD.org
actions: [dir]
post-install: <<EOD
case "%@" in
/*) fontsdir="%@" ;;
*) fontsdir="%D/%@" ;;
esac
mkfontscale ${fontsdir} 2>/dev/null || true
mkfontdir ${fontsdir} 2>/dev/null || true
post-install-lua: <<EOD
fontdir = pkg.prefixed_path("%@")
pkg.exec({"mkfontscale", fontdir})
pkg.exec({"mkfontdir", fontdir})
EOD
post-deinstall: <<EOD
case "%@" in
/*) fontsdir="%@" ;;
*) fontsdir="%D/%@" ;;
esac
mkfontscale ${fontsdir} 2>/dev/null || true
if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then
rm ${fontsdir}/fonts.scale
fi
mkfontdir ${fontsdir} 2>/dev/null || true
if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then
rm ${fontsdir}/fonts.dir
fi
post-deinstall-lua: <<EOD
fontdir = pkg.prefixed_path("%@")
pkg.exec({"mkfontscale", fontdir})
pkg.exec({"mkfontdir", fontdir})
for _, v in pairs {"/fonts.scale", "/fonts.dir" } do
local st = pkg.stat(fontdir .. v)
if st and st.type == "reg" and st.size == 2 then
os.remove(fontdir .. v)
end
end
EOD

3
MOVED
View file

@ -16965,3 +16965,6 @@ games/pushover|games/domino-chain|2022-03-17|Chase upstream rename
graphics/darktable38|graphics/darktable|2022-03-19|Darktable was upgraded to 3.8, separate port no longer needed
security/1password-client-devel|security/1password-client2|2022-03-19|cli version 2 is now released.
x11-toolkits/pangoxsl||2022-03-20|Has expired: Abandonware and not used by any port
print/lgrind||2022-03-22|Has expired: Abandonware as last release was in 2001
devel/py-decorator4||2022-03-22|Has expired: Legacy version, use devel/py-decorator instead
devel/p5-Log-Any-Adapter-Callback|devel/p5-Log-Any|2022-03-22|Has expired: Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead

10
Mk/Uses/fonts.mk
View file

@ -41,23 +41,23 @@
_INCLUDE_USES_FONTS_MK= yes
.if empty(fonts_ARGS)
fonts_ARGS= fcfontsdir
fonts_ARGS= fontsdir
.endif
.if !empty(fonts_ARGS:Nfc:Nfontsdir:Nfcfontsdir:Nnone)
.if !empty(fonts_ARGS:Nfc:Nfontsdir:Nnone)
IGNORE= USES=fonts - invalid ARGS (${fonts_ARGS})
.endif
.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfcfontsdir)
.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfontsdir)
RUN_DEPENDS+= fc-cache:x11-fonts/fontconfig
.endif
.if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
.if !empty(fonts_ARGS:Mfontsdir)
RUN_DEPENDS+= mkfontscale:x11-fonts/mkfontscale
.endif
FONTNAME?= ${PORTNAME}
FONTSDIR?= ${PREFIX}/share/fonts/${FONTNAME}
.if !empty(fonts_ARGS:Nnone)
.if !empty(fonts_ARGS:Mfontsdir)
PLIST_FILES+= "@${fonts_ARGS} ${FONTSDIR}"
.endif
.if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC)

5
Mk/Uses/gnome.mk
View file

@ -76,7 +76,7 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
pygobject3 vte3
# GNOME 40 components
_USE_GNOME_ALL+=gtk40 libadwaita
_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5
# C++ bindings
_USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm24 \
@ -258,6 +258,9 @@ gtksourceview3_USE_GNOME_IMPL=gtk30 libxml2
gtksourceview4_LIB_DEPENDS= libgtksourceview-4.so:x11-toolkits/gtksourceview4
gtksourceview4_USE_GNOME_IMPL=gtk30 libxml2
gtksourceview5_LIB_DEPENDS= libgtksourceview-5.so:x11-toolkits/gtksourceview5
gtksourceview5_USE_GNOME_IMPL=gtk40 libxml2
libgsf_LIB_DEPENDS= libgsf-1.so:devel/libgsf
libgsf_USE_GNOME_IMPL= glib20 libxml2

2
Mk/Uses/linux.mk
View file

@ -236,7 +236,7 @@ SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX}:SOURCE
.ifdef USE_LINUX_RPM_BAD_PERMS
EXTRACT_DEPENDS+= rpm2archive:archivers/rpm4
EXTRACT_CMD= rpm2archive
EXTRACT_BEFORE_ARGS= <
EXTRACT_BEFORE_ARGS= - <
EXTRACT_AFTER_ARGS= | ${TAR} xf - --no-same-owner --no-same-permissions
.endif

3
Mk/bsd.port.mk
View file

@ -1177,8 +1177,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
.endif
_EXPORTED_VARS+= OSVERSION
.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \
(${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1202000
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
are guaranteed to build on this system. Please upgrade to a supported release.
. if defined(ALLOW_UNSUPPORTED_SYSTEM)