freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix build after iconv change [1]

Browse Source 
- Fix build with clang/libc++ ([2] for graphics/ipe)

While here for databases/spatialite:
- Trim Makefile headers
- Remove check for unsupported FreeBSD versions

Submitted by:	marino [1]
Reported by:	swills, antoine [1]
Submitted by:	bsam [2]
Approved by:	portmgr (bapt, implicit)
This commit is contained in:
Guido Falsi
2013-09-13 17:14:53 +00:00
parent 31c9fcf732
commit 42cea4feca
22 changed files with 126 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
databases/spatialite/Makefile
View File

@@ -1,9 +1,5 @@
# New ports collection makefile for: spatialite
# Date created: 11 July 2008
# Whom: Wen Heping <wenheping@gmail.com>
#
# Created by: Wen Heping <wenheping@gmail.com>
# $FreeBSD$
#
PORTNAME= spatialite
PORTVERSION= 3.0.1
@@ -22,12 +18,11 @@ LIB_DEPENDS= geos_c.9:${PORTSDIR}/graphics/geos \
EXTRACT_SUFX = .tar.gz
WRKSRC= ${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SQLITE= yes
USES= iconv
USES= gmake iconv
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
CONFIGURE_ARGS+=CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
@@ -40,10 +35,6 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800000
BROKEN= does not build
.endif
.if ${ARCH} == "powerpc"
BROKEN= Does not compile on powerpc: invokes i386 assembler
.endif

4
editors/mlview/Makefile
View File

@@ -13,10 +13,10 @@ COMMENT= A tree oriented XML editor for Gnome
USE_BZIP2= yes
USE_AUTOTOOLS= autoconf libtool
USES= pathfix gmake pkgconfig
USES= pathfix gmake iconv pkgconfig
USE_GNOME= eel2 gnomeprefix gtksourceview libgnomeui
USE_LDCONFIG= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}"
CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`
GCONF_SCHEMAS= mlview.schemas

4
editors/xmlcopyeditor/Makefile
View File

@@ -16,7 +16,7 @@ USE_WX= 2.8+
WX_COMPS= wx contrib
WX_CONF_ARGS= absolute
WX_UNICODE= yes
USES= gettext
USES= gettext iconv
USE_DOS2UNIX= yes
BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
@@ -32,6 +32,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} ${ICONV_LIB}
.include <bsd.port.mk>

4
games/macopix/Makefile
View File

@@ -30,13 +30,13 @@ RESTRICTED_FILES= \
macopix-mascot-HxB-euc-ja-0.30.tar.gz
WANT_GNOME= yes
USES= gettext gmake pkgconfig
USES= gettext gmake iconv pkgconfig
GNU_CONFIGURE= yes
MAN1= macopix.1
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
.if defined(WITH_GNUTLS)
LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls

20
games/macopix/files/patch-src-callbacks.c Normal file
View File

@@ -0,0 +1,20 @@
--- src/callbacks.c.orig 2008-05-25 07:40:08.000000000 +0200
+++ src/callbacks.c 2013-09-13 17:00:08.911683055 +0200
@@ -509,7 +509,7 @@
if((win_bar_size==0)&&(mascot->no_capbar)){
// for windows w/o title bar
flag_homepos=mascot->homepos_nb;
- if(flag_homepos==HOMEPOS_NEVER) return;
+ if(flag_homepos==HOMEPOS_NEVER) return(0);
}
}
//win_bar_size=0;
@@ -538,7 +538,7 @@
if((win_bar_size==0)&&(mascot->no_capbar)){
// for windows w/o title bar
flag_homepos=mascot->homepos_nb;
- if(flag_homepos==HOMEPOS_NEVER) return;
+ if(flag_homepos==HOMEPOS_NEVER) return(0);
}
break;
}

20
games/macopix/files/patch-src-gui.c Normal file
View File

@@ -0,0 +1,20 @@
--- src/gui.c.orig 2008-06-24 06:44:20.000000000 +0200
+++ src/gui.c 2013-09-13 14:36:40.096276204 +0200
@@ -4557,7 +4557,7 @@
gchar *dest_file;
if(flagChildDialog){
- return;
+ return(NULL);
}
else{
flagChildDialog=TRUE;
@@ -4637,7 +4637,7 @@
char win_title[64];
if(flagChildDialog){
- return;
+ return(NULL);
}
else{
flagChildDialog=TRUE;

20
games/macopix/files/patch-src-mail.c Normal file
View File

@@ -0,0 +1,20 @@
--- src/mail.c.orig 2008-05-24 01:14:42.000000000 +0200
+++ src/mail.c 2013-09-13 17:37:30.649560538 +0200
@@ -1422,7 +1422,7 @@
froms=strbuf(NULL);
if((fp=fopen(mascot->mail.file,"r"))==NULL){
- return;
+ return(NULL);
}
while(!feof(fp)){
@@ -1545,7 +1545,7 @@
froms=strbuf(NULL);
if ((dp=opendir(mascot->mail.file))==NULL){
- return;
+ return(NULL);
}

11
games/macopix/files/patch-src-sockmsg.c Normal file
View File

@@ -0,0 +1,11 @@
--- src/sockmsg.c.orig 2008-05-02 16:05:30.000000000 +0200
+++ src/sockmsg.c 2013-09-13 17:59:53.072457158 +0200
@@ -276,7 +276,7 @@
fd_close(fd);
- if(readsize<4) return;
+ if(readsize<4) return(0);
strncpy(tmp,buf,2);
mode=atoi(tmp);

3
games/supertux-devel/Makefile
View File

@@ -18,7 +18,8 @@ USE_BZIP2= yes
USE_SDL= image
USE_OPENAL= al
USE_GL= glew
USES= cmake:outsource
USES= cmake:outsource iconv
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
post-patch:
${REINPLACE_CMD} -e '/^Icon=/s,supertux.png,supertux2.png,' \

10
games/supertux-devel/files/patch-src-scripting-sound_error.hpp Normal file
View File

@@ -0,0 +1,10 @@
--- src/audio/sound_error.hpp.orig 2013-07-09 01:03:45.000000000 +0200
+++ src/audio/sound_error.hpp 2013-09-13 17:09:14.252645154 +0200
@@ -18,6 +18,7 @@
#define HEADER_SUPERTUX_AUDIO_SOUND_ERROR_HPP
#include <stdexcept>
+#include <string>
class SoundError : public std::exception
{

10
games/supertux-devel/files/patch-src-scripting-squirrel_error.hpp Normal file
View File

@@ -0,0 +1,10 @@
--- src/scripting/squirrel_error.hpp.orig 2013-07-09 01:03:45.000000000 +0200
+++ src/scripting/squirrel_error.hpp 2013-09-13 14:48:42.828225953 +0200
@@ -19,6 +19,7 @@
#include <squirrel.h>
#include <stdexcept>
+#include <string>
namespace scripting {

4
games/teg/Makefile
View File

@@ -10,11 +10,11 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A turn-based strategy game for GNOME
USES= pathfix gmake pkgconfig
USES= pathfix gmake iconv pkgconfig
USE_GNOME= gnomeprefix intlhack libgnomeui
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
CONFIGURE_ARGS= --disable-ggz
GCONF_SCHEMAS= teg.schemas

2
games/tuxtype/Makefile
View File

@@ -33,7 +33,7 @@ CONFIGURE_ENV= T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \
CPPFLAGS+= $$(pkg-config --cflags SDL_Pango) -I${LOCALBASE}/include \
-DHAVE_ALPHASORT -DHAVE_SCANDIR -DHAVE_FSYNC -DICONV_CONST=""
LDFLAGS+= $$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib
LDFLAGS+= $$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib ${ICONV_LIB}
T4K_NAME= t4k_common
T4K_VERSION= 0.1.1

2
games/valyriatear/Makefile
View File

@@ -22,7 +22,7 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \
png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
USES= cmake gettext
USES= cmake gettext iconv
USE_SDL= sdl image ttf
USE_GL= gl
USE_OPENAL= yes

3
graphics/ipe/Makefile
View File

@@ -20,10 +20,9 @@ OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USES= pkgconfig
USES= gmake iconv pkgconfig
USE_QT4= gui moc_build qmake_build rcc_build uic_build
USE_TEX= latex
USE_GMAKE= yes
MAKE_ENV= DLL_CFLAGS="-fPIC" \
ICONV_CFLAGS="-I${LOCALBASE}/include" \
ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \

11
graphics/ipe/files/patch-include__ipebase.h Normal file
View File

@@ -0,0 +1,11 @@
--- include/ipebase.h.orig 2013-09-13 12:51:35.422094300 +0400
+++ include/ipebase.h 2013-09-13 12:52:10.808993351 +0400
@@ -38,6 +38,8 @@
#include <map>
#include <list>
#include <algorithm>
+#include <cstdlib>
+#include <sys/types.h>
// --------------------------------------------------------------------

2
graphics/oyranos/Makefile
View File

@@ -24,7 +24,7 @@ LIB_DEPENDS= raw:${PORTSDIR}/graphics/libraw \
lcms2:${PORTSDIR}/graphics/lcms2 \
Xcm:${PORTSDIR}/x11/libXcm
USES= cmake gettext pkgconfig
USES= cmake gettext iconv pkgconfig
USE_BZIP2= yes
USE_GL= yes
USE_LDCONFIG= yes

2
graphics/qxv/Makefile
View File

@@ -17,7 +17,6 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
glib-2.0.0:${PORTSDIR}/devel/glib20 \
freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
iconv.3:${PORTSDIR}/converters/iconv \
icui18n:${PORTSDIR}/devel/icu \
intl.9:${PORTSDIR}/devel/gettext \
pcre.3:${PORTSDIR}/devel/pcre \
@@ -25,6 +24,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
expat.6:${PORTSDIR}/textproc/expat2 \
xcb.2:${PORTSDIR}/x11/xcb
USES= iconv
USE_BZIP2= yes
USE_XORG= sm xrender xext x11 xau xdmcp ice
USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build

3
japanese/jd/Makefile
View File

@@ -20,12 +20,13 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
gcrypt:${PORTSDIR}/security/libgcrypt \
gtkmm:${PORTSDIR}/x11-toolkits/gtkmm24
USE_GMAKE= yes
USES= gmake iconv
USE_AUTOTOOLS= autoconf automake libtool
USE_GNOME= gtk20 libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-sessionlib=gnomeui
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
OPTIONS_DEFINE= ONIGURUMA PANGOLAYOUT
ONIGURUMA_DESC= Use oniguruma regular expressions library

2
multimedia/w_scan/Makefile
View File

@@ -23,7 +23,7 @@ LINUX_DESC= Install Linux binary too (linux-w_scan)
USE_BZIP2= yes
GNU_CONFIGURE= yes
PATCH_STRIP= -lp1
USES+= gettext
USES+= gettext iconv
CPPFLAGS+= -I"${LOCALBASE}/include"
LDFLAGS+= -L"${LOCALBASE}/lib\ ${ICONV_LIB}"
PORTDOCS= COPYING ChangeLog README

5
palm/gnome-pilot/Makefile
View File

@@ -14,9 +14,8 @@ COMMENT= PalmPilot conduit system for GNOME 2
BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link
USES= pathfix pkgconfig gettext
USES= gmake iconv pathfix pkgconfig gettext
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehier gnomepanel intlhack \
ltverhack libgnomeui
USE_AUTOTOOLS= libtool
@@ -24,7 +23,7 @@ INSTALLS_OMF= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
MAN1= gpilot-install-file.1
GCONF_SCHEMAS= pilot.schemas

2
textproc/scim/Makefile
View File

@@ -24,7 +24,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
.include <bsd.port.pre.mk>
CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
LDFLAGS+= -L${LOCALBASE}/lib -lintl
LDFLAGS+= -L${LOCALBASE}/lib -lintl ${ICONV_LIB}
post-patch:
${REINPLACE_CMD} -e '/^libscim@SCIM_EPOCH@_la_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \