diff options
37 files changed, 468 insertions, 202 deletions
diff --git a/audio/yamt/files/patch-src-Makefile.in b/audio/yamt/files/patch-src-Makefile.in new file mode 100644 index 000000000000..280cfb6eee3f --- /dev/null +++ b/audio/yamt/files/patch-src-Makefile.in @@ -0,0 +1,10 @@ +--- src/Makefile.in.orig 2000-03-31 06:01:10.000000000 -0600 ++++ src/Makefile.in 2011-03-25 13:10:47.000000000 -0500 +@@ -359,7 +359,2 @@ + +- +-dnl INCLUDES = -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR) \ +-dnl -DG_LOG_DOMAIN=\"yamt\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ +-dnl -I../intl -I$(top_srcdir)/intl +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/biology/grappa/files/patch-Makefile b/biology/grappa/files/patch-Makefile new file mode 100644 index 000000000000..3930cca93ef4 --- /dev/null +++ b/biology/grappa/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2004-09-22 09:09:18.000000000 -0500 ++++ Makefile 2011-03-26 13:49:31.000000000 -0500 +@@ -156,8 +156,2 @@ + +-$(RELNAME)/%.c : %.c +- -$(CP) $< $(RELNAME)/. +- +-$(RELNAME)/%.h : %.h +- -$(CP) $< $(RELNAME)/. +- + clean: diff --git a/devel/allegro/files/patch-makefile.in b/devel/allegro/files/patch-makefile.in index 89e7e2189e73..a8df271be4ad 100644 --- a/devel/allegro/files/patch-makefile.in +++ b/devel/allegro/files/patch-makefile.in @@ -1,23 +1,17 @@ ---- makefile.in.orig Fri Jun 15 22:52:28 2007 -+++ makefile.in Fri Jul 13 14:52:12 2007 -@@ -29,11 +29,12 @@ - INFO_DIR = $(infodir)/dir - DESTDIR = +--- makefile.in.orig 2007-07-22 00:55:54.000000000 -0500 ++++ makefile.in 2011-03-25 17:23:23.000000000 -0500 +@@ -31,4 +31,4 @@ -ACLOCAL = aclocal -AUTOCONF = autoconf +ACLOCAL = true +AUTOCONF = true - INSTALL = @INSTALL@ +@@ -36,2 +36,3 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ - INSTALL_INFO = @INSTALL_INFO@ - -@@ -352,6 +353,11 @@ - endif - +@@ -355,2 +356,7 @@ lib: $(ALLEGRO_LIB_TARGETS) + @for l in alleg alld allp; do \ + if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \ @@ -25,11 +19,92 @@ + fi; \ + done - modules: $(ALLEGRO_MODULE_TARGETS) - -@@ -463,9 +469,9 @@ - fi; \ - done +@@ -399,43 +405,43 @@ + # -------- rules for deleting the generated files -------- +- +-clean: +- +- define RM_OBJ_CLEAN_FILES +- $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file) +- ) +- endef +- +- define RM_OTHER_CLEAN_FILES +- $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file) +- ) +- endef +- +- $(RM_OBJ_CLEAN_FILES) +- $(RM_OTHER_CLEAN_FILES) +- +-distclean: clean +- +- define RM_DISTCLEAN_FILES +- $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file) +- ) +- endef +- +- $(RM_DISTCLEAN_FILES) +- +-veryclean: distclean +- +- define RM_VERYCLEAN_FILES +- $(foreach file, $(VERYCLEAN_FILES), rm -f $(file) +- ) +- endef +- +- $(RM_VERYCLEAN_FILES) +- rm -f makefile +- +-maintainer-clean: veryclean +- rm -f configure include/allegro/platform/alunixac.hin +- rm -rf autom4te* +- +- +- ++# XXX: whacked out with gmake 3.82 ++# clean: ++# ++# define RM_OBJ_CLEAN_FILES ++# $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file) ++# ) ++# endef ++# ++# define RM_OTHER_CLEAN_FILES ++# $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file) ++# ) ++# endef ++# ++# $(RM_OBJ_CLEAN_FILES) ++# $(RM_OTHER_CLEAN_FILES) ++# ++# distclean: clean ++# ++# define RM_DISTCLEAN_FILES ++# $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file) ++# ) ++# endef ++# ++# $(RM_DISTCLEAN_FILES) ++# ++# veryclean: distclean ++# ++# define RM_VERYCLEAN_FILES ++# $(foreach file, $(VERYCLEAN_FILES), rm -f $(file) ++# ) ++# endef ++# ++# $(RM_VERYCLEAN_FILES) ++# rm -f makefile ++# ++# maintainer-clean: veryclean ++# rm -f configure include/allegro/platform/alunixac.hin ++# rm -rf autom4te* ++# ++# ++# + # -------- rules for installing the files -------- +@@ -466,5 +472,5 @@ @for l in alleg alld allp; do \ - if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \ - echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \ @@ -38,11 +113,7 @@ + echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \ + $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \ $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \ - fi; \ - done -@@ -479,20 +485,10 @@ - fi - $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -482,16 +488,6 @@ @echo Installing allegro-config to $(DESTDIR)$(bindir) - @$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir) - @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \ @@ -62,5 +133,3 @@ + if test -f $(DESTDIR)$(libdir)/lib$${l}.so.$(shared_version) -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so; then \ + (cd $(DESTDIR)$(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \ fi; \ - done - $(mkinstalldirs) $(DESTDIR)$(prefix)/share/aclocal diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile index 4c324d1add01..9900674725a6 100644 --- a/devel/cc65/Makefile +++ b/devel/cc65/Makefile @@ -45,6 +45,10 @@ post-patch: -e "s,^(CC65_DOC[[:space:]]*=).*,\1," ${WRKSRC}/make/gcc.mak .endif +# XXX: gmake>=3.82 hack: beats the hell out of me. Quick fix. +pre-install: + @${MKDIR} -p ${PREFIX}/lib/cc65/tgi + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${EXAMPLESDIR} diff --git a/devel/deputy/Makefile b/devel/deputy/Makefile index 8c87c3b26867..5ae675744254 100644 --- a/devel/deputy/Makefile +++ b/devel/deputy/Makefile @@ -36,6 +36,7 @@ post-patch: @${REINPLACE_CMD} -e 's|^use OutputFile;|use CIL::OutputFile;|' ${WRKSRC}/cil/lib/TempFile.pm @${REINPLACE_CMD} -e 's|^use Cilly;|use CIL::Cilly;|' ${WRKSRC}/lib/Deputy.pm @${REINPLACE_CMD} -e 's|$$::deputyhome|${PREFIX}|g; s|obj/$$::archos|libexec/deputy|g' ${WRKSRC}/lib/Deputy.pm +# @${REINPLACE_CMD} -e '/ NATIVECAML=1/s/^/#gmake-3.82 BUG/' ${WRKSRC}/Makefile.in do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/deputy ${PREFIX}/bin/ diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 10bb1943d67b..d48342ab0494 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gmake -PORTVERSION= 3.81 -PORTREVISION= 4 +PORTVERSION= 3.82 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= make diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index a6410079661f..6f75d6baced1 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1,3 +1,2 @@ -MD5 (make-3.81.tar.bz2) = 354853e0b2da90c527e35aabb8d6f1e6 -SHA256 (make-3.81.tar.bz2) = f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8 -SIZE (make-3.81.tar.bz2) = 1151445 +SHA256 (make-3.82.tar.bz2) = e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 +SIZE (make-3.82.tar.bz2) = 1242186 diff --git a/devel/gmake/files/patch-ab b/devel/gmake/files/patch-ab index 4d7d9551e18b..f4bcc7661b0c 100644 --- a/devel/gmake/files/patch-ab +++ b/devel/gmake/files/patch-ab @@ -1,14 +1,7 @@ ---- doc/make.texi.orig Mon Oct 7 22:57:59 2002 -+++ doc/make.texi Mon Oct 7 22:58:03 2002 -@@ -25,9 +25,9 @@ - @c Combine the program and concept indices: - @syncodeindex pg cp - --@dircategory GNU Packages -+@dircategory Programming & development tools +--- doc/make.texi.orig 2010-07-19 02:10:54.000000000 -0500 ++++ doc/make.texi 2011-03-02 17:01:58.000000000 -0600 +@@ -54,3 +54,3 @@ @direntry -* Make: (make). Remake files automatically. -+* GNU make: (make). Remake files automatically. ++* GNU Make: (make). Remake files automatically. @end direntry - - @ifinfo diff --git a/devel/gmake/files/patch-make.h b/devel/gmake/files/patch-make.h deleted file mode 100644 index 28a63d2eb076..000000000000 --- a/devel/gmake/files/patch-make.h +++ /dev/null @@ -1,12 +0,0 @@ ---- make.h.orig Wed Sep 11 18:55:44 2002 -+++ make.h Mon Oct 21 22:05:11 2002 -@@ -33,7 +33,7 @@ - # ifdef _AIX - #pragma alloca - # else --# ifndef alloca /* predefined by HP cc +Olibcalls */ -+# if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */ - char *alloca (); - # endif - # endif - diff --git a/devel/gmake/files/patch-read.c b/devel/gmake/files/patch-read.c new file mode 100644 index 000000000000..4ca91c48663c --- /dev/null +++ b/devel/gmake/files/patch-read.c @@ -0,0 +1,52 @@ +Add a fix for bug #30612 (http://savannah.gnu.org/bugs/index.php?30612) +from GNU make's CVS repository (revision 1.194). + +Taken from pkgsrc repository: devel/gmake/patches/patch-ah + +--- read.c.orig 2010-07-13 01:20:42.000000000 +0000 ++++ read.c +@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist index 596ac18a9553..d2135903549e 100644 --- a/devel/gmake/pkg-plist +++ b/devel/gmake/pkg-plist @@ -10,17 +10,16 @@ bin/gmake %%NLS%%share/locale/he/LC_MESSAGES/make.mo %%NLS%%share/locale/hr/LC_MESSAGES/make.mo %%NLS%%share/locale/id/LC_MESSAGES/make.mo +%%NLS%%share/locale/it/LC_MESSAGES/make.mo %%NLS%%share/locale/ja/LC_MESSAGES/make.mo %%NLS%%share/locale/ko/LC_MESSAGES/make.mo +%%NLS%%share/locale/lt/LC_MESSAGES/make.mo %%NLS%%share/locale/nl/LC_MESSAGES/make.mo %%NLS%%share/locale/pl/LC_MESSAGES/make.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo %%NLS%%share/locale/ru/LC_MESSAGES/make.mo -%%NLS%%share/locale/rw/LC_MESSAGES/make.mo %%NLS%%share/locale/sv/LC_MESSAGES/make.mo %%NLS%%share/locale/tr/LC_MESSAGES/make.mo %%NLS%%share/locale/uk/LC_MESSAGES/make.mo %%NLS%%share/locale/vi/LC_MESSAGES/make.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo -%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/rw diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile deleted file mode 100644 index a6f05464a21e..000000000000 --- a/devel/gmake381/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# New ports collection makefile for: GNU make -# Date created: 11 September 1994 -# Whom: jkh -# -# $FreeBSD$ -# - -PORTNAME= gmake381 -PORTVERSION= 3.81 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= make -DISTNAME= make-${PORTVERSION} - -MAINTAINER= autotools@FreeBSD.org -COMMENT= GNU version of 'make' utility (3.81 legacy version) - -IGNORE= Internal infrastructure usage only. Do _not_ use directly. - -USE_BZIP2= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-nls -PLIST_FILES= bin/gmake381 - -.ifdef USE_GMAKE -.error You have `USE_GMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/make ${PREFIX}/bin/gmake381 - -.include <bsd.port.mk> diff --git a/devel/gmake381/distinfo b/devel/gmake381/distinfo deleted file mode 100644 index f43fc5ab1aa3..000000000000 --- a/devel/gmake381/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (make-3.81.tar.bz2) = f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8 -SIZE (make-3.81.tar.bz2) = 1151445 diff --git a/devel/gmake381/files/patch-make.h b/devel/gmake381/files/patch-make.h deleted file mode 100644 index 28a63d2eb076..000000000000 --- a/devel/gmake381/files/patch-make.h +++ /dev/null @@ -1,12 +0,0 @@ ---- make.h.orig Wed Sep 11 18:55:44 2002 -+++ make.h Mon Oct 21 22:05:11 2002 -@@ -33,7 +33,7 @@ - # ifdef _AIX - #pragma alloca - # else --# ifndef alloca /* predefined by HP cc +Olibcalls */ -+# if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */ - char *alloca (); - # endif - # endif - diff --git a/devel/gmake381/pkg-descr b/devel/gmake381/pkg-descr deleted file mode 100644 index d7f5370aeb8b..000000000000 --- a/devel/gmake381/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -GNU make is a tool that controls the generation of executables and other -non-source files from source files. Its purpose is the same as that -of the utility make(1). - -WWW: http://www.gnu.org/software/make/make.html diff --git a/devel/hyena/Makefile b/devel/hyena/Makefile index 9a94b27336c1..bfd0ade4516f 100644 --- a/devel/hyena/Makefile +++ b/devel/hyena/Makefile @@ -22,5 +22,7 @@ USE_GNOME= gtksharp20 post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(libdir)/../libdata/pkgconfig|g' \ ${WRKSRC}/build/pkg-config/Makefile.in + @${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \ + ${REINPLACE_CMD} -e 's/^dnl/# dnl/' .include <bsd.port.mk> diff --git a/devel/psptoolchain-binutils/files/patch-gprof-Makefile.in b/devel/psptoolchain-binutils/files/patch-gprof-Makefile.in new file mode 100644 index 000000000000..b9375e17b5c3 --- /dev/null +++ b/devel/psptoolchain-binutils/files/patch-gprof-Makefile.in @@ -0,0 +1,11 @@ +--- gprof/Makefile.in.orig 2004-11-30 11:20:48.000000000 -0600 ++++ gprof/Makefile.in 2011-03-26 14:42:27.000000000 -0500 +@@ -231,3 +231,2 @@ + AUTOMAKE_OPTIONS = cygnus +-SUFFIXES = .m + SUBDIRS = po +@@ -264,4 +263,2 @@ + +-.SUFFIXES: +-.SUFFIXES: .m .c .dvi .html .info .lo .o .obj .pdf .ps .texi + am--refresh: diff --git a/editors/glimmer/files/patch-intl::Makefile.in b/editors/glimmer/files/patch-intl::Makefile.in new file mode 100644 index 000000000000..80264a7d1b9a --- /dev/null +++ b/editors/glimmer/files/patch-intl::Makefile.in @@ -0,0 +1,15 @@ +--- intl/Makefile.in.orig 2000-11-09 17:30:01.000000000 -0600 ++++ intl/Makefile.in 2011-03-25 13:42:37.000000000 -0500 +@@ -201,12 +201,2 @@ + +-# The dependency for intlh.inst is different in gettext and all other +-# packages. Because we cannot you GNU make features we have to solve +-# the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: +- + # Tell versions [3.59,3.63) of GNU make not to export all variables. diff --git a/games/grubik/Makefile b/games/grubik/Makefile index 430ae25196fa..06ae70817c4d 100644 --- a/games/grubik/Makefile +++ b/games/grubik/Makefile @@ -18,13 +18,14 @@ COMMENT= Virtual 3D Rubiks cube for GNUstep LICENSE= GPLv2 +USE_GMAKE= yes USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes post-patch: - ${RMDIR} ${WRKSRC}/GRubik.app/ix86/linux-gnu - ${RMDIR} ${WRKSRC}/GRubik.app/ix86 + @${RM} -rf ${WRKSRC}/GRubik.app/ix86 + @${REINPLACE_CMD} -e 's|^//|# //|' ${WRKSRC}/GNUmakefile .include <bsd.port.mk> diff --git a/games/lgeneral/files/patch-intl::Makefile.in b/games/lgeneral/files/patch-intl::Makefile.in new file mode 100644 index 000000000000..69babd49cae5 --- /dev/null +++ b/games/lgeneral/files/patch-intl::Makefile.in @@ -0,0 +1,15 @@ +--- intl/Makefile.in.orig 2006-05-29 11:43:09.000000000 -0500 ++++ intl/Makefile.in 2011-03-25 14:51:01.000000000 -0500 +@@ -205,12 +205,2 @@ + +-# The dependency for intlh.inst is different in gettext and all other +-# packages. Because we cannot you GNU make features we have to solve +-# the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: +- + # Tell versions [3.59,3.63) of GNU make not to export all variables. diff --git a/games/pinball/Makefile b/games/pinball/Makefile index 4279035f4695..02e79bb83365 100644 --- a/games/pinball/Makefile +++ b/games/pinball/Makefile @@ -42,6 +42,11 @@ DOCS= README .include <bsd.port.pre.mk> +# For gmake>=3.82 +post-patch: + @${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \ + ${REINPLACE_CMD} -e 's,^dnl,# dnl,' + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 2fa9e20933b3..a3946732153b 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -34,6 +34,11 @@ CONFIGURE_ARGS= --with-tclconfig=${TCL_LIBDIR} \ --with-tkconfig=${TK_LIBDIR} \ --enable-alternate-scoresdir=${SCOREDIR} +# Fix for gmake >= 3.82 +post-patch: + @${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \ + ${REINPLACE_CMD} -e 's/^ */ /' + post-install: .for file in xconq imf2x x2imf ximfapp ${STRIP_CMD} ${PREFIX}/bin/${file} diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile index 703577fc9862..0acedd9fcfbc 100644 --- a/graphics/allegrogl/Makefile +++ b/graphics/allegrogl/Makefile @@ -11,7 +11,7 @@ CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION} DISTNAME= alleggl-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= utisoft@gmail.com COMMENT= OpenGL inteface for Allegro library LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro @@ -31,10 +31,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|^[[:blank:]]make |${GMAKE} |' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -Ee \ - 's|@INSTALL@ (@INSTALL_(DATA\|PROGRAM)@) -D|\1|; \ - s|(CFLAGS) =|\1 +=|' \ - ${WRKSRC}/make/makefile.unx post-install: @${MKDIR} ${EXAMPLESDIR} diff --git a/graphics/allegrogl/files/patch-make-makefiles b/graphics/allegrogl/files/patch-make-makefiles new file mode 100644 index 000000000000..62d2777b3641 --- /dev/null +++ b/graphics/allegrogl/files/patch-make-makefiles @@ -0,0 +1,107 @@ +diff -ruN allegrogl/work/alleggl/make/makefile.all make/makefile.all +--- allegrogl/work/alleggl/make/makefile.all 2007-01-06 20:39:09.000000000 +0000 ++++ make/makefile.all 2011-04-07 15:30:09.579220344 +0100 +@@ -31,10 +31,6 @@ + - rm -rf docs/rtf + else + - del $(LIB_PATH_D) +- define RM_EXAMPLES +- $(foreach file, $(wildcard $(subst /,\,$(EXAMPLES))), - del $(file) +- ) +- endef + - $(RM_EXAMPLES) + - @echo Y|del docs\html\*.* + - rd docs\html +@@ -47,7 +43,6 @@ + PROG_INSTALLER=cp + endif + +-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) + ifdef UNIX_TOOLS + define CP_INSTALL + $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +@@ -59,6 +54,7 @@ + $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) + ) + endef ++install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) + ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),) + mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl + endif +@@ -87,33 +83,6 @@ + @echo - + @echo AllegroGL is now installed. + +-uninstall: +-ifdef UNIX_TOOLS +- define RM_UNINSTALL +- $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) +- ) +- $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +- ) +- $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +- ) +- endef +- - rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U)) +- - $(RM_UNINSTALL) +- - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext +- - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl +-else +- define RM_UNINSTALL +- $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) +- ) +- $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) +- ) +- endef +- - $(RM_UNINSTALL) +- - rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl +- - del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U)) +-endif +- @echo - +- @echo AllegroGL is uninstalled. + + $(EXT_HEADERS_PATH_U)/gl_ext_alias.h: $(EXT_HEADERS_PATH_U)/gl_ext_api.h + ifdef UNIX_TOOLS +diff -ruN allegrogl/work/alleggl/make/makefile.unx make/makefile.unx +--- allegrogl/work/alleggl/make/makefile.unx 2007-11-10 19:33:06.000000000 +0000 ++++ make/makefile.unx 2011-04-07 15:31:41.631562520 +0100 +@@ -28,8 +28,8 @@ + # Programs + CC = @CC@ + CXX = @CXX@ +-DATA_INSTALLER = @INSTALL@ @INSTALL_DATA@ -D +-PROG_INSTALLER = @INSTALL@ @INSTALL_PROGRAM@ -D ++DATA_INSTALLER = @INSTALL_DATA@ ++PROG_INSTALLER = @INSTALL_PROGRAM@ + + + # Where to install the library and header file +@@ -67,13 +67,13 @@ + # --- Compiler optimizations ---# + + ifdef DEBUGMODE +- CFLAGS = -g -W -Wall -Wno-unused ++ CFLAGS += -g -W -Wall -Wno-unused + CFLAGS += -DDEBUGMODE=$(DEBUGMODE) + ifdef LOGLEVEL + CFLAGS += -DLOGLEVEL=$(LOGLEVEL) + endif + else +- CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer ++ CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer + endif + + ifdef SHARED +@@ -149,11 +149,11 @@ + + include make/makefile.dep + +-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) + define MAKE_LINKS + $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link) + ) + endef ++$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) + $(LIB_BUILDER) $@ $^ + - $(MAKE_LINKS) + diff --git a/mail/ifile/files/patch-Makefile.in b/mail/ifile/files/patch-Makefile.in index eaf6dcf7bcff..40f7e2428cfe 100644 --- a/mail/ifile/files/patch-Makefile.in +++ b/mail/ifile/files/patch-Makefile.in @@ -1,11 +1,14 @@ ---- Makefile.in.orig Tue Jun 10 23:09:27 2003 -+++ Makefile.in Mon Jul 7 06:50:51 2003 -@@ -46,7 +46,7 @@ - CFLAGS = @CFLAGS@ - CPPFLAGS = @CPPFLAGS@ +--- Makefile.in.orig 2006-05-22 11:49:21.000000000 -0500 ++++ Makefile.in 2011-03-25 14:18:34.000000000 -0500 +@@ -48,3 +48,3 @@ INCLUDEFLAGS = -LDFLAGS = +LDFLAGS = @LDFLAGS@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ +@@ -56,4 +56,4 @@ + # Installation locations +-if [ ! $bindir ] ; then bindir = $(exec_prefix)/bin; fi +-if [ ! $mandir ] ; then mandir = $(prefix)/man; fi ++# if [ ! $bindir ] ; then bindir = $(exec_prefix)/bin; fi ++# if [ ! $mandir ] ; then mandir = $(prefix)/man; fi + diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile index fcb561ddc781..640ccc5a02f8 100644 --- a/misc/gnustep-examples/Makefile +++ b/misc/gnustep-examples/Makefile @@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep example applications +USE_GMAKE= yes USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile index 20095603c819..139477d790c3 100644 --- a/multimedia/k9copy/Makefile +++ b/multimedia/k9copy/Makefile @@ -31,5 +31,8 @@ post-patch: @${REINPLACE_CMD} -e \ 's,$$(LIB_KDEUI),$$(LIB_KDEUI) $$(LIBPTHREAD) -lcam,g' \ ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + 's,^kde includedir,# kde includedir,' \ + ${WRKSRC}/libk9copy/Makefile.in .include <bsd.port.mk> diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure index 40981fe8fcd8..482346213870 100644 --- a/multimedia/mythtv-frontend/files/patch-configure +++ b/multimedia/mythtv-frontend/files/patch-configure @@ -1,70 +1,40 @@ ---- configure.orig 2010-11-08 18:40:43.000000000 +0100 -+++ configure 2010-11-11 19:23:31.000000000 +0100 -@@ -691,21 +691,21 @@ - log check_cc "$@" - cat > $TMPC +--- configure.orig 2010-11-08 11:40:43.000000000 -0600 ++++ configure 2011-03-25 17:14:43.000000000 -0500 +@@ -693,3 +693,3 @@ log_file $TMPC - check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC } - - check_cpp(){ - log check_cpp "$@" - cat > $TMPC +@@ -700,3 +700,3 @@ log_file $TMPC - check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC } - - check_cxx(){ - log check_cxx "$@" - cat > $TMPCXX +@@ -707,3 +707,3 @@ log_file $TMPCXX - check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX + check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX } - - check_as(){ -@@ -1865,7 +1865,7 @@ - - # machine +@@ -1867,3 +1867,3 @@ arch_default=$(uname -m) -cpu="generic" +cpu="i686" processor=`uname -p 2>/dev/null` - processor_flags="" - tune="generic" -@@ -2826,7 +2826,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|k8-sse3|opteron-sse3|athlon64-sse3|core2|amdfam10|barcelona|atom) - cpuflags="-march=$cpu" +@@ -2828,3 +2828,3 @@ enable cmov - enable fast_cmov + disable fast_cmov ;; - # targets that do support conditional mov but on which it's slow - pentium4|pentium4m|prescott|nocona) -@@ -3026,7 +3026,6 @@ - enable malloc_aligned - # Workaround compile errors from missing u_int/uint def +@@ -3028,3 +3028,2 @@ CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` - disable ivtv enable backend - ;; - bsd/os) -@@ -4742,6 +4741,8 @@ - # directories, it cannot be modified. - QMAKE_LIBDIR_QT-=${sysroot}${libdir} +@@ -4744,2 +4743,4 @@ LATE_LIBS+=-L${sysroot}${libdir} +CONFIG_INCLUDEPATH= -+FREETYPE_CFLAGS -= -I/usr/local/include ++FREETYPE_CFLAGS-= -I/usr/local/include EOF - - #echo "endif # FFMPEG_CONFIG_MAK" >> config.mak -@@ -4778,6 +4779,7 @@ - BINDIR=\$(INSTALL_ROOT)$bindir - DATADIR=\$(INSTALL_ROOT)$datadir +@@ -4780,2 +4781,3 @@ MANDIR=\$(INSTALL_ROOT)$mandir +CFLAGS+=-I/usr/local/include endif # FFMPEG_CONFIG_MAK - EOF - diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure index 40981fe8fcd8..381784f208a9 100644 --- a/multimedia/mythtv/files/patch-configure +++ b/multimedia/mythtv/files/patch-configure @@ -1,70 +1,40 @@ ---- configure.orig 2010-11-08 18:40:43.000000000 +0100 -+++ configure 2010-11-11 19:23:31.000000000 +0100 -@@ -691,21 +691,21 @@ - log check_cc "$@" - cat > $TMPC +--- configure.orig 2010-11-08 11:40:43.000000000 -0600 ++++ configure 2011-03-25 17:16:03.000000000 -0500 +@@ -693,3 +693,3 @@ log_file $TMPC - check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC } - - check_cpp(){ - log check_cpp "$@" - cat > $TMPC +@@ -700,3 +700,3 @@ log_file $TMPC - check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC } - - check_cxx(){ - log check_cxx "$@" - cat > $TMPCXX +@@ -707,3 +707,3 @@ log_file $TMPCXX - check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX + check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX } - - check_as(){ -@@ -1865,7 +1865,7 @@ - - # machine +@@ -1867,3 +1867,3 @@ arch_default=$(uname -m) -cpu="generic" +cpu="i686" processor=`uname -p 2>/dev/null` - processor_flags="" - tune="generic" -@@ -2826,7 +2826,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|k8-sse3|opteron-sse3|athlon64-sse3|core2|amdfam10|barcelona|atom) - cpuflags="-march=$cpu" +@@ -2828,3 +2828,3 @@ enable cmov - enable fast_cmov + disable fast_cmov ;; - # targets that do support conditional mov but on which it's slow - pentium4|pentium4m|prescott|nocona) -@@ -3026,7 +3026,6 @@ - enable malloc_aligned - # Workaround compile errors from missing u_int/uint def +@@ -3028,3 +3028,2 @@ CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` - disable ivtv enable backend - ;; - bsd/os) -@@ -4742,6 +4741,8 @@ - # directories, it cannot be modified. - QMAKE_LIBDIR_QT-=${sysroot}${libdir} +@@ -4744,2 +4743,4 @@ LATE_LIBS+=-L${sysroot}${libdir} +CONFIG_INCLUDEPATH= -+FREETYPE_CFLAGS -= -I/usr/local/include ++FREETYPE_CFLAGS-= -I/usr/local/include EOF - - #echo "endif # FFMPEG_CONFIG_MAK" >> config.mak -@@ -4778,6 +4779,7 @@ - BINDIR=\$(INSTALL_ROOT)$bindir - DATADIR=\$(INSTALL_ROOT)$datadir +@@ -4780,2 +4781,3 @@ MANDIR=\$(INSTALL_ROOT)$mandir +CFLAGS+=-I/usr/local/include endif # FFMPEG_CONFIG_MAK - EOF - diff --git a/net-p2p/dctc-gui/files/patch-intl_Makefile.in b/net-p2p/dctc-gui/files/patch-intl_Makefile.in new file mode 100644 index 000000000000..4c4215613998 --- /dev/null +++ b/net-p2p/dctc-gui/files/patch-intl_Makefile.in @@ -0,0 +1,15 @@ +--- intl/Makefile.in.orig 2001-09-02 01:58:14.000000000 -0500 ++++ intl/Makefile.in 2011-03-25 13:27:57.000000000 -0500 +@@ -201,12 +201,2 @@ + +-# The dependency for intlh.inst is different in gettext and all other +-# packages. Because we cannot you GNU make features we have to solve +-# the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: +- + # Tell versions [3.59,3.63) of GNU make not to export all variables. diff --git a/net-p2p/fidelio/files/patch-intl::Makefile.in b/net-p2p/fidelio/files/patch-intl::Makefile.in new file mode 100644 index 000000000000..009c39e7f1d5 --- /dev/null +++ b/net-p2p/fidelio/files/patch-intl::Makefile.in @@ -0,0 +1,15 @@ +--- intl/Makefile.in.orig 2000-05-05 03:02:56.000000000 -0500 ++++ intl/Makefile.in 2011-03-25 13:34:41.000000000 -0500 +@@ -201,12 +201,2 @@ + +-# The dependency for intlh.inst is different in gettext and all other +-# packages. Because we cannot you GNU make features we have to solve +-# the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: +- + # Tell versions [3.59,3.63) of GNU make not to export all variables. diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile index 9c963473f136..eb15382e8286 100644 --- a/net/gupnp-igd/Makefile +++ b/net/gupnp-igd/Makefile @@ -23,4 +23,9 @@ USE_GNOME= gnomehack intlhack libglade2 glib20 USE_LDCONFIG= yes USE_PYTHON= yes +# For gmake >= 3.82 -- no idea where this line comes from, patching +# the Makefile.in seems to have no effect +post-configure: + @${REINPLACE_CMD} -e 's|^\[|# \[|' ${WRKSRC}/python/Makefile + .include <bsd.port.mk> diff --git a/net/libevnet/files/patch-gmake382 b/net/libevnet/files/patch-gmake382 new file mode 100644 index 000000000000..4777ceb12c19 --- /dev/null +++ b/net/libevnet/files/patch-gmake382 @@ -0,0 +1,30 @@ +--- mk/Epilogue.mk.orig 2009-11-28 23:02:27.000000000 -0600 ++++ mk/Epilogue.mk 2011-03-25 15:05:17.000000000 -0500 +@@ -4,6 +4,6 @@ + # +-d := $(dirstack_$(sp)) ++d:= $(dirstack_$(sp)) + +-sp ?= $(shell basename "$(sp)") +-sp != basename "$(sp)" ++sp?= $(shell basename "$(sp)") ++sp!= basename "$(sp)" + +--- mk/Prologue.mk.orig 2011-03-25 15:05:05.000000000 -0500 ++++ mk/Prologue.mk 2011-03-25 15:05:34.000000000 -0500 +@@ -4,5 +4,5 @@ + # +-sp := $(sp).x +-dirstack_$(sp) := $(d) +-d := $(dir) ++sp:= $(sp).x ++dirstack_$(sp):= $(d) ++d:= $(dir) + +@@ -10,4 +10,4 @@ + # Our parent directory +-$(d)/.. ?= $(shell dirname "$(d)") +-$(d)/.. != dirname "$(d)" ++$(d)/..?= $(shell dirname "$(d)") ++$(d)/..!= dirname "$(d)" + diff --git a/sysutils/lire/files/patch-doc-Makefile.in b/sysutils/lire/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..70860156e229 --- /dev/null +++ b/sysutils/lire/files/patch-doc-Makefile.in @@ -0,0 +1,8 @@ +--- doc/Makefile.in.orig 2009-03-13 23:14:22.000000000 -0500 ++++ doc/Makefile.in 2011-03-26 13:55:02.000000000 -0500 +@@ -700,5 +700,2 @@ + +-$(dtd_infos)/%: +- cd doc && $(MAKE) $* +- + $(html_doc_dirs): diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile index abc640e55873..7570e5245407 100644 --- a/sysutils/slmon/Makefile +++ b/sysutils/slmon/Makefile @@ -32,6 +32,10 @@ LDFLAGS= -L${LOCALBASE}/lib -lncurses -lm .include <bsd.port.pre.mk> +# For gmake>=3.82 +post-patch: + @${REINPLACE_CMD} -e 's/^ */ /' ${WRKSRC}/Makefile.in + .if ${OSVERSION} > 900007 BROKEN= fails to build with new utmpx .endif diff --git a/www/swish++/files/patch-man::GNUmakefile b/www/swish++/files/patch-man::GNUmakefile new file mode 100644 index 000000000000..4b899d66c0dc --- /dev/null +++ b/www/swish++/files/patch-man::GNUmakefile @@ -0,0 +1,7 @@ +--- man/GNUmakefile.orig 2004-04-30 00:03:24.000000000 -0500 ++++ man/GNUmakefile 2011-03-26 13:59:57.000000000 -0500 +@@ -32,3 +32,3 @@ + +-all %: ++all install: + @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile index 6f6483062f6e..e4fa01b5b54e 100644 --- a/x11-toolkits/v/Makefile +++ b/x11-toolkits/v/Makefile @@ -19,7 +19,7 @@ COMMENT= A C++ GUI development framework for X11 and Microsoft Windows WRKSRC= ${WRKDIR}/home/vgui USE_XORG= x11 xt xmu xaw -USE_GMAKE= YES +USE_GMAKE= yes MAKE_ENV= INSTALLDIR=${PREFIX} HOMEV=${WRKSRC} USE_DOS2UNIX= yes @@ -29,6 +29,10 @@ USE_DOS2UNIX= yes BROKEN= compiler error in function fixup_memory_subreg .endif +# For gmake>=3.82 +post-patch: + @${REINPLACE_CMD} -e 's/^ cd/# cd/' ${WRKSRC}/srcx/Makefile + do-configure: ${CP} ${WRKSRC}/configs/ConfigX.mk ${WRKSRC}/Config.mk |