diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-12-06 15:56:56 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-12-06 15:56:56 +0000 |
| commit | b18bb4afe880be0fd3f6f656a1390bc0a88773cc (patch) | |
| tree | 1ce9478500180598fa24537ac0a00eca366b3c58 | |
| parent | 999601df3fde48719bf26ffb5cb564ea8aad87ee (diff) | |
Apply the new C++ patch to all of the ruby-qt2* ports and unbreak them.
Notes
Notes:
svn path=/head/; revision=71398
| -rw-r--r-- | x11-toolkits/ruby-qt2/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/ruby-qt2/Makefile.common | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile index acdffda19554..f583a265a576 100644 --- a/x11-toolkits/ruby-qt2/Makefile +++ b/x11-toolkits/ruby-qt2/Makefile @@ -31,8 +31,6 @@ post-extract: ${FIND} ${WRKSRC} '(' -name .cvsignore -o -name a.out ')' -delete post-patch: - ${GREP} -Frl 'typedef VALUE (*VALUEFUNC)();' ${WRKSRC} | \ - ${XARGS} ${RUBY} -i -pe 'sub(/typedef VALUE \(\*VALUEFUNC\)\(\);/, "typedef VALUE (*VALUEFUNC)(...);")' ${RUBY} -i -pe 'sub %r"/usr/X11\b", "${X11BASE}"' ${WRKSRC}/lib/qt2.rb post-install: diff --git a/x11-toolkits/ruby-qt2/Makefile.common b/x11-toolkits/ruby-qt2/Makefile.common index 81dbcebd7ea8..e08a6c30fd10 100644 --- a/x11-toolkits/ruby-qt2/Makefile.common +++ b/x11-toolkits/ruby-qt2/Makefile.common @@ -19,7 +19,11 @@ RUBY_QT2_CONFIGURE_ARGS= \ MD5_FILE= ${RUBY_QT2_PORTDIR}/distinfo -post-patch: post-patch-cflags +post-patch: post-patch-cflags post-patch-c++ post-patch-cflags: ${RUBY} -i -pe '~ /^\$$CFLAGS\b.*/ and $$_.sub!(/-O\w*/, "")' ${WRKSRC}/extconf.rb + +post-patch-c++: + ${GREP} -Frl 'typedef VALUE (*VALUEFUNC)();' ${WRKSRC} | \ + ${XARGS} ${RUBY} -i -pe 'sub(/typedef VALUE \(\*VALUEFUNC\)\(\);/, "typedef VALUE (*VALUEFUNC)(...);")' |