1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

- Fix build with GCC 4.9 [1]

- Add option DOCS
- Bump PORTREVISION (change pkg-plist)
- Add files/patch-src_fbuild_Makefile.in and
  files/patch-src_makefmt_Makefile.in to fix
  build with GCC 4.9

PR:	197896 [1]
Submitted by:	gerald
This commit is contained in:
Nicola Vitale 2015-02-23 15:35:30 +00:00
parent 384499b46f
commit c126ea3f9a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=379684
5 changed files with 42 additions and 5 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= gle-graphics
DISTVERSION= 4.2.4cf
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics print
MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1}
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@ -24,6 +24,11 @@ BITMAP_IMAGES_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
CONFIGURE_ARGS= --with-extrafonts=yes
ALL_TARGET= all
DOCS_ALL_TARGET= doc
DOCS_USE= tex=latex:build tex=dvipsk:build
GNU_CONFIGURE= yes
LATEX_GS_DESC= Use LaTeX & GhostScript
@ -31,7 +36,7 @@ LATEX_GS_USE= tex=latex ghostscript=run
MAKE_JOBS_UNSAFE=yes
OPTIONS_DEFINE= BITMAP_IMAGES LATEX_GS X11
OPTIONS_DEFINE= DOCS BITMAP_IMAGES LATEX_GS X11
OPTIONS_DEFAULT= BITMAP_IMAGES LATEX_GS X11
PLIST_SUB+= PORTVERSION=${PORTVERSION}

View File

@ -1,6 +1,6 @@
--- ./Makefile.in.orig 2014-07-28 01:58:20.000000000 +0200
+++ ./Makefile.in 2014-07-28 01:58:44.000000000 +0200
@@ -101,7 +101,7 @@
--- Makefile.in.orig 2015-02-23 13:12:35 UTC
+++ Makefile.in
@@ -101,7 +101,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
INSTALL_DATA=@INSTALL_DATA@
MKDIR_P=@MKDIR_P@
@ -9,3 +9,11 @@
MANDIR=@mandir@
GLE_VERSION=@GLE_VERSION@
@@ -514,7 +514,6 @@ doc:
$(MAKE) -C gle-refman -f Makefile.gcc pdf
cp gle-refman/gle-manual.pdf build/doc/
cp README.txt build/doc/
- cp LICENSE.txt build/doc/
autopackage:
(export APBUILD_STATIC_LIBGCC=1; export APBUILD_STATIC="tiff png12 png jpeg z"; makepackage platform/autopackage/gle4.apspec)

View File

@ -0,0 +1,11 @@
--- src/fbuild/Makefile.in.orig 2015-02-23 12:40:36 UTC
+++ src/fbuild/Makefile.in
@@ -64,7 +64,7 @@ $(OBJECTS): %.o: %.cpp $(INCLUDES)
$(CXX) $(CPPFLAGS) -c $< -o $@
$(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF): $(OBJECTS) $(EXTRA_OBJS) $(INCLUDES) $(PROGRAM).cpp
- $(CXX) $(CPPFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
+ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
clean:
-$(RM) $(OBJECTS) $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) $(PROGRAM).$(OBJ_SUFF)

View File

@ -0,0 +1,11 @@
--- src/makefmt/Makefile.in.orig 2015-02-23 12:40:36 UTC
+++ src/makefmt/Makefile.in
@@ -60,7 +60,7 @@ $(OBJECTS): %.o: %.cpp $(INCLUDES)
$(CXX) $(CPPFLAGS) -c $< -o $@
$(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF): $(OBJECTS) $(EXTRA_OBJS) $(INCLUDES) $(PROGRAM).cpp
- $(CXX) $(CPPFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
+ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
clean:
-$(RM) $(OBJECTS) $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) $(PROGRAM).$(OBJ_SUFF)

View File

@ -5,6 +5,8 @@
lib/libgle-graphics-4.2.4c.so
libdata/pkgconfig/gle-graphics.pc
man/man1/gle.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/gle-manual.pdf
%%DATADIR%%/4.2.4c/font/arial8.fmt
%%DATADIR%%/4.2.4c/font/arialbd8.fmt
%%DATADIR%%/4.2.4c/font/arialbi8.fmt