diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile index 01c1b18cb745..5d2e9081de99 100644 --- a/x11-wm/jewel/Makefile +++ b/x11-wm/jewel/Makefile @@ -1,43 +1,46 @@ PORTNAME= jewel PORTVERSION= 0.12.41 PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://mjr.towers.org.uk/comp/ MAINTAINER= ports@FreeBSD.org COMMENT= Window manager based on aewm++ WWW= http://www.mjr.dsl.pipex.com/xwinman.html #jewel LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler gmake xorg +USE_CXXSTD= c++14 USE_XORG= x11 xext xpm -ALL_TARGET= all -PORTDOCS= Changelog Changelog.DLR Changelog.jewel INSTALL README + MAKE_ARGS= CFLAGS="${CXXFLAGS}" +ALL_TARGET= all CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing +PORTDOCS= Changelog Changelog.DLR Changelog.jewel INSTALL README + OPTIONS_DEFINE= DOCS post-patch: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -i '' -e 's|g++|${CXX}|g; s|gcc|${CC}|g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jewel ${STAGEDIR}${PREFIX}/bin/jewel ${INSTALL_PROGRAM} ${WRKSRC}/goodies/appbar/appbar ${STAGEDIR}${PREFIX}/bin/jewel-appbar ${INSTALL_PROGRAM} ${WRKSRC}/goodies/fspanel/fspanel ${STAGEDIR}${PREFIX}/bin/jewel-fspanel ${INSTALL_PROGRAM} ${WRKSRC}/goodies/setrootimage/setrootimage ${STAGEDIR}${PREFIX}/bin/jewel-setrootimage ${INSTALL_PROGRAM} ${WRKSRC}/goodies/xsession/xsession ${STAGEDIR}${PREFIX}/bin/jewel-xsession ${INSTALL_MAN} ${WRKSRC}/jewel.1x ${STAGEDIR}${PREFIX}/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for ii in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/x11-wm/jewel/files/patch-goodies-fspanel_Makefile b/x11-wm/jewel/files/patch-goodies-fspanel_Makefile index 0ad2306dfed3..3a1aa220fa77 100644 --- a/x11-wm/jewel/files/patch-goodies-fspanel_Makefile +++ b/x11-wm/jewel/files/patch-goodies-fspanel_Makefile @@ -1,22 +1,22 @@ --- goodies/fspanel/Makefile.orig 2005-01-03 22:54:58.000000000 +0100 +++ goodies/fspanel/Makefile 2013-09-26 17:14:21.000000000 +0200 @@ -1,8 +1,10 @@ -CC = gcc -C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -m386 -malign-loops=2 -malign-jumps=2 -malign-functions=2 +CC ?= gcc -+C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-functions=2 ++C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-functions=2 --std=c++14 L_FLAGS = -O1 -Xlinker -s -L$(XROOT)/lib -lX11 -lXpm PROGNAME = fspanel - + +all: $(PROGNAME) + $(PROGNAME): Makefile fspanel.c fspanel.h icon.xpm $(CC) $(C_FLAGS) $(L_FLAGS) fspanel.c -o $(PROGNAME) @ls -l $(PROGNAME) @@ -14,4 +16,4 @@ cp -r $(PROGNAME) $(DESTDIR)$(prefix)/bin - + uninstall: - rm $(DESTDIR)$(prefix)/bin/$(PROGNAME) \ No newline at end of file + rm $(DESTDIR)$(prefix)/bin/$(PROGNAME)