Index: head/x11/eaglemode/Makefile =================================================================== --- head/x11/eaglemode/Makefile (revision 488327) +++ head/x11/eaglemode/Makefile (revision 488328) @@ -1,97 +1,95 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= eaglemode -PORTVERSION= 0.93.2 -PORTREVISION= 2 +PORTVERSION= 0.94.0 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Futuristic zoomable user environment LICENSE= GPLv3 LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 -USES= compiler:features jpeg perl5 pkgconfig shebangfix tar:bzip2 +USES= compiler:features jpeg gnome perl5 \ + pkgconfig tar:bzip2 USE_PERL5= build USE_XORG= x11 xext xxf86vm SUB_FILES= eaglemode.sh LLD_UNSAFE= yes BUILD_ARGS= continue=no .for lib in X11 jpeg png tiff BUILD_ARGS+= ${lib}-inc-dir="${LOCALBASE}/include" \ ${lib}-lib-dir="${LOCALBASE}/lib" .endfor DATADIR= ${PREFIX}/lib/${PORTNAME} PLIST_FILES= bin/${PORTNAME} PORTDATA= * OPTIONS_DEFINE= XINE RSVG PDF OPTIONS_DEFAULT=XINE RSVG PDF OPTIONS_SUB= yes RSVG_DESC= SVG support through librsvg PDF_DESC= PDF support through poppler-glib XINE_LIB_DEPENDS= libxine.so:multimedia/libxine RSVG_USE= GNOME=librsvg2 PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib PDF_USE= GNOME=gtk20 .include .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 USE_GCC= yes .endif .if ${PORT_OPTIONS:MXINE} BUILD_ARGS+= xine-inc-dir="${LOCALBASE}/include" \ xine-lib-dir="${LOCALBASE}/lib" .endif post-patch: - @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|"-O2"|"${CFLAGS}"|' \ - ${WRKSRC}/makers/unicc/plugins/unicc_gnu.pm @${FIND} ${WRKSRC} -name "*.pl" | ${XARGS} \ ${REINPLACE_CMD} -e '1s|/usr/bin/perl|${perl_CMD}|' post-patch-XINE-off: @${RM} ${WRKSRC}/makers/emAv.maker.pm post-patch-RSVG-off: @${RM} ${WRKSRC}/makers/emSvg.maker.pm post-patch-PDF-off: @${RM} ${WRKSRC}/makers/emPdf.maker.pm do-build: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${PERL} make.pl build ${BUILD_ARGS}) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${PERL} make.pl install dir=${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/eaglemode.sh ${STAGEDIR}${PREFIX}/bin/eaglemode @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/bin/* \ ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emClock/emTimeZonesProc \ ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emTmpConv/emTmpConvProc do-install-XINE-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emAv/emAvServerProc_xine do-install-RSVG-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emSvg/emSvgServerProc do-install-PDF-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emPdf/emPdfServerProc .include Index: head/x11/eaglemode/distinfo =================================================================== --- head/x11/eaglemode/distinfo (revision 488327) +++ head/x11/eaglemode/distinfo (revision 488328) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532802088 -SHA256 (eaglemode-0.93.2.tar.bz2) = 28724e92d17d9cb6a6dc5de5b5097e5c85389abffde3d216a33188a8f0de9bf9 -SIZE (eaglemode-0.93.2.tar.bz2) = 16541578 +TIMESTAMP = 1545663590 +SHA256 (eaglemode-0.94.0.tar.bz2) = 33798753e41f22756a6402efc445729d25ef93982a43de36de5ac8e4535b23eb +SIZE (eaglemode-0.94.0.tar.bz2) = 16726294 Index: head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm =================================================================== --- head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm (revision 488327) +++ head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm (nonexistent) @@ -1,18 +0,0 @@ ---- makers/unicc/plugins/unicc_gnu.pm.orig 2008-10-29 08:27:34.000000000 +0300 -+++ makers/unicc/plugins/unicc_gnu.pm 2008-10-30 00:08:33.000000000 +0300 -@@ -142,6 +142,7 @@ - push(@args,GetObjFiles->[$index]); - } - -+ @args = split(/\s+/, join(' ', @args)); - return PrintAndRun(@args); - } - -@@ -178,6 +179,7 @@ - } - } - -+ @args = split(/\s+/, join(' ', @args)); - return PrintAndRun(@args); - } - Property changes on: head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm =================================================================== --- head/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm (nonexistent) +++ head/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm (revision 488328) @@ -0,0 +1,33 @@ +--- makers/unicc/plugins/unicc_gnu.pm.orig 2018-12-23 06:47:44 UTC ++++ makers/unicc/plugins/unicc_gnu.pm +@@ -35,7 +35,7 @@ my $IsWinOrCygwin; + my $IsDarwin; + + { +- my $s=`gcc -dumpversion`; # Examples: "4.3", "2.95.3" ++ my $s=`$ENV{'CC'} -dumpversion`; # Examples: "4.3", "2.95.3" + if ($? != 0) { exit(1); } + for (;; $s=substr($s,1)) { + if (length($s)==0) { die("Cannot determine GCC version, stopped"); } +@@ -112,9 +112,9 @@ sub Compile + push(@args,("-o",GetObjFiles->[$index])); + } + else { +- push(@args,"gcc"); ++ push(@args,$isCpp ? $ENV{'CXX'} : $ENV{'CC'}); + if (HaveDebug) { push(@args,"-g"); } +- push(@args,"-O2"); ++ push(@args,split(/\s+/, $isCpp ? $ENV{'CXXFLAGS'} : $ENV{'CFLAGS'})); + if ($isCpp && $GccVersion>=4.7 && $GccVersion<6.1) { + push(@args,"-std=c++11"); + } +@@ -167,7 +167,8 @@ sub Link + push(@args,(@{GetObjFiles()})); + } + else { +- push(@args,"gcc"); ++ push(@args,$ENV{'CC'}); ++ push(@args,split(/\s+/, $ENV{'LDFLAGS'})); + if (HaveDebug) { push(@args,"-g"); } + if ($type eq 'dynlib') { + push(@args,$IsDarwin ? "-dynamiclib" : "-shared"); Property changes on: head/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property