prcs-1.3.3 was recently released. It now claims to compile with gcc-3.x, which should simplify the build a little. Fix: update Makefile and distinfo. I'll look into doing it myself, but I've never done it before (any guidance appreciated).
State Changed From-To: open->feedback You can find information on doing updates in the Porter's Handbook on the FreeBSD-website under "Documentation". Also, the ports- mailinglist will gladly help you with any doubts.
Ok, here's my first shot at a patch. Explanation of changes: - Update PORTVERSION and PORTREVISION, and distinfo - Drop USE_GCC=2.95, since the port now compiles with gcc3.x - The previous version decided whether or not to install various emacs support files by checking .if exists(${LOCALBASE}/bin/emacs) These conditionals don't seem to work properly, perhaps because LOCALBASE isn't defined at the time they are evaluated. In any case the solution seems a bit kludgy. I've completely removed that portion of the port pending suggestions from more experienced folk. The port builds, packages and deinstalls cleanly in my tests. Comments/suggestions/criticisms gratefully received. Ian Leroux diff -ru /usr/ports/devel/prcs/Makefile ./Makefile --- /usr/ports/devel/prcs/Makefile Tue Feb 17 09:10:25 2004 +++ ./Makefile Thu Jul 1 13:59:54 2004 @@ -6,8 +6,8 @@ # PORTNAME= prcs -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTVERSION= 1.3.3 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,32 +18,13 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_REINPLACE= yes -USE_GCC= 2.95 MAN1= prcs.1 INFO= prcs -PLIST_FILES= bin/prcs bin/prcs-callback bin/prcs-ediff bin/prcs-emerge - -.if exists(${LOCALBASE}/bin/emacs) -PLIST_FILES+= share/emacs/site-lisp/prcs.el \ - share/emacs/site-lisp/prcs.elc \ - share/emacs/site-lisp/prcs-ediff.el \ - share/emacs/site-lisp/prcs-ediff.elc \ - share/emacs/site-lisp/prcs-hooks.el \ - share/emacs/site-lisp/prcs-hooks.elc -.endif - -post-patch: - ${REINPLACE_CMD} -Ee 's,#!/usr/local/bin/perl5?,#!${PERL},g' \ - ${WRKSRC}/contrib/prcs-* +PLIST_FILES= bin/prcs pre-configure: -.if !exists(${LOCALBASE}/bin/emacs) ${REINPLACE_CMD} -Ee "s@^(SUBDIRS = .*) emacs (.*)@\1 \2@" \ ${WRKSRC}/Makefile.in -.endif - -post-install: - install-info ${PREFIX}/info/${INFO}.info ${PREFIX}/info/dir .include <bsd.port.mk> diff -ru /usr/ports/devel/prcs/distinfo ./distinfo --- /usr/ports/devel/prcs/distinfo Mon Jun 28 21:44:02 2004 +++ ./distinfo Wed Jun 30 19:36:47 2004 @@ -1,2 +1,2 @@ -MD5 (prcs-1.3.0.tar.gz) = 1b81acce7da7121bf9095d610ff67366 -SIZE (prcs-1.3.0.tar.gz) = 829632 +MD5 (prcs-1.3.3.tar.gz) = 057a0e243828104d0e672ec1cbf3fea0 +SIZE (prcs-1.3.3.tar.gz) = 907482
Great, now it's broken with gcc 2 :) c++ -DHAVE_CONFIG_H -I. -I. -I.. -I./include -O -pipe -g -fmemoize-lookups -fsave-memoized -Wall -c -o prcs.o `test -f 'prcs.cc' || echo './'`prcs.cc In file included from prcs.cc:27: include/prcs.h:46: streambuf: No such file or directory In file included from include/typedefs.h:121, from include/prcs.h:85, from prcs.cc:27: include/dstring.h:50: ostream: No such file or directory Cheers, Volker
From the NEWS file of the original source distribution ** Changes since version 1.3.1 * Make it work with gcc-3.2. I'm sorry if this doesn't compile with * earlier compilers. I conclude that gcc-2 is explicitly un-supported. Looking at the patches that were used to get previous versions to compile under gcc-3, there are a bunch of changes having to do with handling of streams. I might be able to back-port it, but this seems like a lot of work for little gain: I'd mostly just be undoing the source cleanup effort by the original author (there are no bug-fixes or functionality changes listed in NEWS). It might be simpler to postpone the upgrade until most users are on gcc-3 equipped systems. Regards, Ian
I think you should also install the emacs-stuff like the previous version did. Volker
Next version: I've updated pkg-descr (removed some obsolete information, put in the current WWW address). I've restored the old emacs support sections, but I now use bsd.port.pre.mk to ensure that ${LOCALBASE} is defined early enough that they work. I've also moved some PLIST_FILES that were only installed for emacs support into the conditional. post-patch target adjusted to account for changes in the source distribution's directory structure. Now have USE_GCC=3.2 as per the CHANGELOG in the source distribution diff -ru /usr/ports/devel/prcs/Makefile prcs/Makefile --- /usr/ports/devel/prcs/Makefile Tue Feb 17 09:10:25 2004 +++ prcs/Makefile Thu Jul 29 18:50:55 2004 @@ -6,8 +6,8 @@ # PORTNAME= prcs -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTVERSION= 1.3.3 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,14 +18,17 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_REINPLACE= yes -USE_GCC= 2.95 +USE_GCC= 3.2 MAN1= prcs.1 INFO= prcs -PLIST_FILES= bin/prcs bin/prcs-callback bin/prcs-ediff bin/prcs-emerge +PLIST_FILES= bin/prcs + +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/bin/emacs) -PLIST_FILES+= share/emacs/site-lisp/prcs.el \ +PLIST_FILES+= bin/prcs-callback bin/prcs-ediff bin/prcs-emerge \ + share/emacs/site-lisp/prcs.el \ share/emacs/site-lisp/prcs.elc \ share/emacs/site-lisp/prcs-ediff.el \ share/emacs/site-lisp/prcs-ediff.elc \ @@ -35,15 +38,12 @@ post-patch: ${REINPLACE_CMD} -Ee 's,#!/usr/local/bin/perl5?,#!${PERL},g' \ - ${WRKSRC}/contrib/prcs-* + ${WRKSRC}/emacs/prcs-* -pre-configure: +pre-configure: .if !exists(${LOCALBASE}/bin/emacs) ${REINPLACE_CMD} -Ee "s@^(SUBDIRS = .*) emacs (.*)@\1 \2@" \ ${WRKSRC}/Makefile.in .endif -post-install: - install-info ${PREFIX}/info/${INFO}.info ${PREFIX}/info/dir - -.include <bsd.port.mk> +.include <bsd.port.post.mk> Only in /usr/ports/devel/prcs: README.html diff -ru /usr/ports/devel/prcs/distinfo prcs/distinfo --- /usr/ports/devel/prcs/distinfo Mon Jun 28 21:44:02 2004 +++ prcs/distinfo Wed Jun 30 19:36:47 2004 @@ -1,2 +1,2 @@ -MD5 (prcs-1.3.0.tar.gz) = 1b81acce7da7121bf9095d610ff67366 -SIZE (prcs-1.3.0.tar.gz) = 829632 +MD5 (prcs-1.3.3.tar.gz) = 057a0e243828104d0e672ec1cbf3fea0 +SIZE (prcs-1.3.3.tar.gz) = 907482 diff -ru /usr/ports/devel/prcs/pkg-descr prcs/pkg-descr --- /usr/ports/devel/prcs/pkg-descr Sun Aug 1 00:54:38 1999 +++ prcs/pkg-descr Thu Jul 29 18:03:57 2004 @@ -3,11 +3,7 @@ to its authors, at least), it is much simpler than any of those systems. -The current release, version 1.0, and future releases of PRCS can be -found at ftp://XCF.Berkeley.EDU/pub/prcs. HTML documentation and -recent developments are available online at - -WWW: http://www.XCF.Berkeley.EDU/~jmacd/prcs.html +WWW: http://prcs.sourceforge.net PRCS is released under the GNU public license, see the file COPYING for details.
Am 30. Jul 2004 um 01:07 CEST schrieb Ian D. Leroux: > Next version: > I've updated pkg-descr (removed some obsolete information, put in the > current WWW address). > > I've restored the old emacs support sections, but I now use > bsd.port.pre.mk to ensure that ${LOCALBASE} is defined early enough that > they work. I've also moved some PLIST_FILES that were only installed for > emacs support into the conditional. > > post-patch target adjusted to account for changes in the source > distribution's directory structure. > > Now have USE_GCC=3.2 as per the CHANGELOG in the source distribution USE_GCC=3.2 is very unfortunate, since this is just a lower bound (well, in 99% of the cases) but -CURRENT already uses 3.3 and will move to 3.4 shortly. So this should be at least 3.3 a) because it doesn't do any harm and b) will avoid the -CURRENT users have to pull in 3.2 as a dependency. I'll do this change on-the-fly if you don't object. Thanks for restoring the emacs-support! Cheers, Volker -- http://www-i2.informatik.rwth-aachen.de/stolz/ *** PGP *** S/MIME L-Attriwutgrammatik
Adjusting USE_GCC is fine with me. Thanks for the info! Ian -- Ian D. Leroux ian_leroux@fastmail.fm
State Changed From-To: feedback->closed Committed, thanks! [Good job!]