- Fix build on -current
Remake of the patch against current tree.
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Fri Feb 7 15:54:25 2014 New Revision: 343270 URL: http://svnweb.freebsd.org/changeset/ports/343270 QAT: https://qat.redports.org/buildarchive/r343270/ Log: - Fix build - Stage support PR: 184234 Submitted by: ports fury Added: head/emulators/generator/files/patch-hdr__registers.h (contents, props changed) head/emulators/generator/files/patch-main__reg68k.c (contents, props changed) Modified: head/emulators/generator/Makefile Modified: head/emulators/generator/Makefile ============================================================================== --- head/emulators/generator/Makefile Fri Feb 7 15:44:06 2014 (r343269) +++ head/emulators/generator/Makefile Fri Feb 7 15:54:25 2014 (r343270) @@ -10,58 +10,50 @@ MASTER_SITES= http://www.squish.net/gene MAINTAINER= ports@FreeBSD.org COMMENT= SEGA Genesis emulator -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LICENSE= GPLv2 +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg + +USES= gmake USE_GNOME= gtk12 USE_SDL= sdl -USES= gmake - GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=--with-gtk - +CONFIGURE_ARGS= --with-gtk MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= OPTIMIZED_CFLAGS RAZE SDL -RAZE_DESC= Use RAZE z80 emulation (only for i386) -SDL_DESC= Use SDL for audio +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/${PORTNAME}-gtk -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL +OPTIONS_DEFINE_i386= RAZE -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CONFIGURE_ARGS+=--with-gcc=3 -.else -CONFIGURE_ARGS+=--without-gcc -.endif +OPTIMIZED_CFLAGS_CONFIGURE_ON= --with-gcc=3 +OPTIMIZED_CFLAGS_CONFIGURE_OFF= --without-gcc +RAZE_DESC= Use RAZE z80 emulation +RAZE_BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +RAZE_CONFIGURE_ON= --with-raze +SDL_DESC= Use SDL for audio +SDL_CONFIGURE_ON= --with-sdl-audio -.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386" -BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm -CONFIGURE_ARGS+=--with-raze -.else +.include <bsd.port.options.mk> + +.if empty(PORT_OPTIONS:MRAZE) CONFIGURE_ARGS+=--with-cmz80 .endif -.if ${PORT_OPTIONS:MSDL} -CONFIGURE_ARGS+=--with-sdl-audio -.endif +.include <bsd.port.pre.mk> post-patch: .if ${ARCH} != "amd64" && ${ARCH} != "i386" # These architectures do not support "-minline-all-stringops" - @${REINPLACE_CMD} -e 's|-minline-all-stringops||g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -. if ${ARCH} == "alpha" -# "-ffast-math" does not work on alpha - @${REINPLACE_CMD} -e 's|-ffast-math||g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -. endif + @${REINPLACE_CMD} -e \ + 's|-minline-all-stringops||g' ${WRKSRC}/configure .endif - @${REINPLACE_CMD} -e '/%define %1 @UNDERSCORE@%1 /d' \ - ${WRKSRC}/raze/raze.asm.in + @${REINPLACE_CMD} -e \ + '/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in .include <bsd.port.post.mk> Added: head/emulators/generator/files/patch-hdr__registers.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/generator/files/patch-hdr__registers.h Fri Feb 7 15:54:25 2014 (r343270) @@ -0,0 +1,23 @@ +--- hdr/registers.h.orig ++++ hdr/registers.h +@@ -3,17 +3,17 @@ + call a C function, then when that C function returns these registers are + still what they were before we made the call. */ + +-#ifdef PROCESSOR_ARM ++#if defined(PROCESSOR_ARM) && !defined(__clang__) + register uint32 reg68k_pc asm ("r7"); + register uint32 *reg68k_regs asm ("r8"); + register t_sr reg68k_sr asm ("r9"); + #else +-# ifdef PROCESSOR_SPARC ++# if defined(PROCESSOR_SPARC) && !defined(__clang__) + register uint32 reg68k_pc asm ("5"); + register uint32 *reg68k_regs asm ("6"); + register t_sr reg68k_sr asm ("7"); + # else +-# ifdef PROCESSOR_INTEL ++# if defined(PROCESSOR_INTEL) && !defined(__clang__) + register uint32 reg68k_pc asm ("%ebx"); + register uint32 *reg68k_regs asm ("%edi"); + register t_sr reg68k_sr asm ("%esi"); Added: head/emulators/generator/files/patch-main__reg68k.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/generator/files/patch-main__reg68k.c Fri Feb 7 15:54:25 2014 (r343270) @@ -0,0 +1,13 @@ +--- main/reg68k.c.orig ++++ main/reg68k.c +@@ -20,8 +20,8 @@ + + /*** global variables ***/ + +-#if (!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \ +- || defined(PROCESSOR_INTEL))) ++#if ((!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \ ++ || defined(PROCESSOR_INTEL))) || defined(__clang__)) + uint32 reg68k_pc; + uint32 *reg68k_regs; + t_sr reg68k_sr; _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Author: miwi Date: Fri Feb 7 15:54:38 2014 New Revision: 343271 URL: http://svnweb.freebsd.org/changeset/ports/343271 QAT: https://qat.redports.org/buildarchive/r343271/ Log: - Fix build - Stage support PR: 184234 Submitted by: Ports Fury Modified: head/databases/gtksql/Makefile head/databases/gtksql/files/patch-Makefile.in head/databases/gtksql/pkg-plist Modified: head/databases/gtksql/Makefile ============================================================================== --- head/databases/gtksql/Makefile Fri Feb 7 15:54:25 2014 (r343270) +++ head/databases/gtksql/Makefile Fri Feb 7 15:54:38 2014 (r343271) @@ -3,73 +3,80 @@ PORTNAME= gtksql PORTVERSION= 0.4.5 +PORTREVISION= 1 CATEGORIES= databases -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Graphical query tool for PostgreSQL/MySQL/SQLite -LICENSE= GPLv2 +LICENSE= GPLv2 # (or later) -LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app +LIB_DEPENDS= libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla +RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils -GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool -USES= pkgconfig gmake -USE_GNOME= gtk20 -LDFLAGS+= -L${LOCALBASE}/lib -lgmodule-2.0 +OPTIONS_DEFINE= AVAHI +OPTIONS_MULTI= DB +OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE +OPTIONS_DEFAULT= SQLITE -MAN1= ${PORTNAME}.1 -PORTDOCS= AUTHORS ChangeLog NEWS README TODO +USES= gettext gmake pkgconfig +USE_GNOME= gtk20 +GNU_CONFIGURE= yes +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ + AUTOHEADER="${TRUE}" -OPTIONS_MULTI= DB -OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE3 -OPTIONS_DEFAULT= MYSQL PGSQL SQLITE3 +CPPFLAGS+= -I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lscintilla -lscintilla_lexers -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +.if ${PORT_OPTIONS:MAVAHI} +LIB_DEPENDS+= libavahi-common.so:${PORTSDIR}/net/avahi-app .else -CONFIGURE_ARGS+=--without-mysql +CONFIGURE_ARGS+= --without-avahi .endif -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" +.if ${PORT_OPTIONS:MMYSQL} +USE_MYSQL= yes +CPPFLAGS+= -I${LOCALBASE}/include/mysql +LDFLAGS+= -L${LOCALBASE}/lib/mysql .else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " +CONFIGURE_ARGS+= --without-mysql .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes .else -CONFIGURE_ARGS+=--without-postgresql +CONFIGURE_ARGS+= --without-postgresql .endif -.if ${PORT_OPTIONS:MSQLITE3} -LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 +.if ${PORT_OPTIONS:MSQLITE} +USE_SQLITE= yes .else -CONFIGURE_ARGS+=--without-sqlite +CONFIGURE_ARGS+= --without-sqlite .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/include/mysql|${LOCALBASE}/include/mysql|g' \ - -e 's|/usr/include/postgresql|${LOCALBASE}/include/postgresql/server|g' \ + @${REINPLACE_CMD} -e \ + '/-lstdc++/s|^|#| ; \ + /scintilla.a/s|^|#| ; \ + /\/scintilla\/include/s|^|#| ; \ + /ac_header/s|postgres.h|libpq-fe.h| ; \ + /^packagedatadir/s|=.*|=share/gtksql|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} 's|make|$$(MAKE)|' \ - ${WRKSRC}/scintilla/Makefile.in - @${REINPLACE_CMD} 's|-Os|${CFLAGS}|g' \ - ${WRKSRC}/scintilla/gtk/makefile - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif + @${REINPLACE_CMD} -e \ + 's|-O1|| ; \ + s|-g$$|-DGTK|' \ + ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + 's|<postgres\.h>|<postgresql/internal/c.h>|' \ + ${WRKSRC}/src/d_postgres_f.c + @${REINPLACE_CMD} -e \ + 's|mozilla|xdg-open|' \ + ${WRKSRC}/src/gtkui-object.c + @${REINPLACE_CMD} -e \ + 's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \ + ${WRKSRC}/src/plugins.c .include <bsd.port.mk> Modified: head/databases/gtksql/files/patch-Makefile.in ============================================================================== --- head/databases/gtksql/files/patch-Makefile.in Fri Feb 7 15:54:25 2014 (r343270) +++ head/databases/gtksql/files/patch-Makefile.in Fri Feb 7 15:54:38 2014 (r343271) @@ -1,20 +1,19 @@ --- Makefile.in.orig 2013-10-08 11:01:04.306764000 +0200 +++ Makefile.in 2013-10-08 11:27:51.000000000 +0200 -@@ -728,7 +728,7 @@ +@@ -237,14 +237,12 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = Pics po scintilla intl src pixmaps man gnome +-gtksqldocdir = ${prefix}/doc/gtksql ++SUBDIRS = Pics po src pixmaps man gnome ++gtksqldocdir = ${docdir} + gtksqldoc_DATA = \ + README\ +- COPYING\ + AUTHORS\ + ChangeLog\ +- INSTALL\ + NEWS\ + TODO - info-am: - --install-data-am: install-gtksqldocDATA -+install-data-am: - - install-dvi: install-dvi-recursive - -@@ -764,7 +764,7 @@ - - ps-am: - --uninstall-am: uninstall-gtksqldocDATA -+uninstall-am: - - .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip Modified: head/databases/gtksql/pkg-plist ============================================================================== --- head/databases/gtksql/pkg-plist Fri Feb 7 15:54:25 2014 (r343270) +++ head/databases/gtksql/pkg-plist Fri Feb 7 15:54:38 2014 (r343271) @@ -1,35 +1,44 @@ bin/gtksql +man/man1/gtksql.1.gz share/applications/gtksql.desktop -%%NLS%%share/locale/de_DE/LC_MESSAGES/gtksql.mo -share/pixmaps/connect-grey.xpm -share/pixmaps/connect.png -share/pixmaps/connect.xpm -share/pixmaps/delete-grey.xpm -share/pixmaps/delete.xpm -share/pixmaps/disconnect-grey.xpm -share/pixmaps/disconnect.png -share/pixmaps/disconnect.xpm -share/pixmaps/export-grey.xpm -share/pixmaps/export.xpm -share/pixmaps/gtksql.png -share/pixmaps/gtksql.xpm -share/pixmaps/gtksql_db.png -share/pixmaps/gtksql_field.png -share/pixmaps/gtksql_gnome_icon.png -share/pixmaps/gtksql_table.png -share/pixmaps/new-grey.xpm -share/pixmaps/new.xpm -share/pixmaps/open-grey.xpm -share/pixmaps/open.xpm -share/pixmaps/question.xpm -share/pixmaps/refresh-grey.xpm -share/pixmaps/refresh.xpm -share/pixmaps/rename-grey.xpm -share/pixmaps/rename.xpm -share/pixmaps/save-grey.xpm -share/pixmaps/save.xpm -share/pixmaps/send-grey.xpm -share/pixmaps/send.xpm -share/pixmaps/warning.xpm -%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/de_DE +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%DATADIR%%/pixmaps/connect-grey.xpm +%%DATADIR%%/pixmaps/connect.png +%%DATADIR%%/pixmaps/connect.xpm +%%DATADIR%%/pixmaps/delete-grey.xpm +%%DATADIR%%/pixmaps/delete.xpm +%%DATADIR%%/pixmaps/disconnect-grey.xpm +%%DATADIR%%/pixmaps/disconnect.png +%%DATADIR%%/pixmaps/disconnect.xpm +%%DATADIR%%/pixmaps/export-grey.xpm +%%DATADIR%%/pixmaps/export.xpm +%%DATADIR%%/pixmaps/gtksql.png +%%DATADIR%%/pixmaps/gtksql.xpm +%%DATADIR%%/pixmaps/gtksql_db.png +%%DATADIR%%/pixmaps/gtksql_field.png +%%DATADIR%%/pixmaps/gtksql_gnome_icon.png +%%DATADIR%%/pixmaps/gtksql_table.png +%%DATADIR%%/pixmaps/new-grey.xpm +%%DATADIR%%/pixmaps/new.xpm +%%DATADIR%%/pixmaps/open-grey.xpm +%%DATADIR%%/pixmaps/open.xpm +%%DATADIR%%/pixmaps/question.xpm +%%DATADIR%%/pixmaps/refresh-grey.xpm +%%DATADIR%%/pixmaps/refresh.xpm +%%DATADIR%%/pixmaps/rename-grey.xpm +%%DATADIR%%/pixmaps/rename.xpm +%%DATADIR%%/pixmaps/save-grey.xpm +%%DATADIR%%/pixmaps/save.xpm +%%DATADIR%%/pixmaps/send-grey.xpm +%%DATADIR%%/pixmaps/send.xpm +%%DATADIR%%/pixmaps/warning.xpm +share/locale/de_DE/LC_MESSAGES/gtksql.mo +@dirrmtry share/locale/de_DE/LC_MESSAGES +@dirrmtry share/locale/de_DE +@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"