Bug 166754 - [maintainer] [patch] lang/harbour: update to 3.0.0 and unbreak
Summary: [maintainer] [patch] lang/harbour: update to 3.0.0 and unbreak
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Michael Scheidell
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-04-08 14:50 UTC by m.tsatsenko
Modified: 2012-04-14 14:30 UTC (History)
0 users

See Also:


Attachments
file.diff (15.93 KB, patch)
2012-04-08 14:50 UTC, m.tsatsenko
no flags Details | Diff
harbour.txt (16.16 KB, text/plain; charset=US-ASCII)
2012-04-10 12:36 UTC, m.tsatsenko
no flags Details
harbour.txt (16.40 KB, text/plain; charset=US-ASCII)
2012-04-12 01:21 UTC, m.tsatsenko
no flags Details
harbour.txt (16.54 KB, text/plain; charset=US-ASCII)
2012-04-13 20:33 UTC, m.tsatsenko
no flags Details
Makefile (3.32 KB, text/plain)
2012-04-14 12:33 UTC, Michael Scheidell
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description m.tsatsenko 2012-04-08 14:50:12 UTC
- Unbreak port on FreeBSD 9 by updating it to 3.0.0

Fix: Patch attached with submission follows:
Comment 1 Michael Scheidell freebsd_committer freebsd_triage 2012-04-10 10:09:02 UTC
Responsible Changed
From-To: freebsd-ports-bugs->scheidell

I'll take it.
Comment 2 Michael Scheidell freebsd_committer freebsd_triage 2012-04-10 10:13:48 UTC
State Changed
From-To: open->feedback

Thank you for your continued support of FreeBSD. 
I was about to commit this update for you, and noticed a couple of things. 
First, not all that important.  the .if ${ARCH}, could be converted to NOT_FOR_ARCHS/(REASON) 
Second, this installs shared libraries, needs proper use of LDCONFIG 
Third, it looks like you did a 'copy/paste' on this patch, and it did not preserve the <tab>s. 

Could you run portlint -abt on the final of this, and upload a new patch as an attachment?
Comment 3 m.tsatsenko 2012-04-10 12:36:38 UTC
Here is a corrected patch

--
 Mikhail
Comment 4 Michael Scheidell freebsd_committer freebsd_triage 2012-04-11 10:13:05 UTC
Question: sorry I didn't notice this before.

is this a master or slave port? I noticed this in an odd location in the 
Makefile:

OPTIONS+=       MYSQL "MySQL database support" on \
                 SQLITE3 "SQLite 3.x database support" on \
                 FIREBIRD "Firebird (Interbase) database support" on \
                 PGSQL "PostgreSQL database support" on

(the location is a little odd, and the += is a little odd)


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 5 Michael Scheidell freebsd_committer freebsd_triage 2012-04-11 12:31:37 UTC
No joy:

Still broken on 9.x:  You might want to join freebsd-ports mailing list 
and specifically ask about changes to (missing utmp.h) and utmp functions.
You also might want to search GNATS (pr database, support database) for 
closed pr's that have dealt with this.

<http://lorie.secnap.net/tb/index.php?action=display_markup_log&build=9-scheidell_AMD64&id=1559#839>
<http://lorie.secnap.net/tb/index.php?action=display_markup_log&build=9-scheidell_I386&id=1559#852>

gcc -I. -I../../../../../include -W -Wall -O3 -DHB_LEGACY_TYPES_OFF 
-fPIC -oucmacice.o -c ../../../ucmacice.c
852     In file included from ../../../gtcrs.c:56:
853     ../../../gtcrs.h:105:40: error: utmp.h: No such file or directory


I see this in your Makefile:
> .if defined(CC)&&  ${CC} == "clang"
> +HB_COMPILER=       clang
> +.else
> +HB_COMPILER=      gcc
> +USE_GCC=   4.2+
> +.endif
>   

did you define CC in your env? or make.conf to get this to compile?
We need those defines in your Makefile so that an OP doesn't have to put 
custom defines in their make.conf (and FreeBSD build clusters won't either)

Do you have a tinderbox?  can you join redports and test his out on 
redports?


I can still commit the upgrade to 3.0, but will need to leave in the 
BROKEN part.  Your choice.

Also, I have a 'nicer' Makefile for you to look at.
Puts some of the sections in more standard places (NOT_FOR_ARCH/ OPTIONS 
near top where people normally look for them).
Also re-wrapped the .if !defined NOPORTDOCS, and will work on that later.

my tinderbox has 7.4 and 8.2, and they compile just fine.

my test box is 9.x, so I can't really test this fully.


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 6 m.tsatsenko 2012-04-12 01:21:37 UTC
> .if defined(CC)&& ${CC} == "clang"
> +HB_COMPILER= clang
> +.else
> +HB_COMPILER= gcc
> +USE_GCC= 4.2+
> +.endif
I have removed these lines and created an option for CLANG  (like
www/chromium does) instead them.
NOT_FOR_ARCHS is placed just after *_DEPENDS section now.
Also conditionally changing utmp.h to utmpx.h on freebsd9 was enough
to build the port. I just compiled it successfully under 9.0
tinderbox.

But I did't understand what should I do with NOPORTDOCS.

Here is updated patch.

--
 Mikhail
Comment 7 Michael Scheidell freebsd_committer freebsd_triage 2012-04-13 15:06:21 UTC
On 4/11/12 8:30 PM, Mikhail Tsatsenko wrote:
>   But I did't understand what should I do with NOPORTDOCS.
>
I am looking at it now.
everything compiles now with defaults in 7,8,9, i386,amd64. but...

if you do a 'make -DNOPORTDOCS install'  it installs the portdocs anyway.

I am looking into it.
Might need to patch wksrc/Makefile.* or ../config/* files.

If you get it figured out before I do, send me what you have.

-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 8 m.tsatsenko 2012-04-13 20:33:02 UTC
I found the problem. There is no patching required. We need just to
catch up with upstream variable change in our Makefile.

See attached patch.
Comment 9 Michael Scheidell freebsd_committer freebsd_triage 2012-04-14 12:33:21 UTC
I moved things around a little, but don't think I changed the intent.
portmgr, system operators and users like to see 'options' at the top, the intent is that quickly they can see what options 
exist, what arch's you support, what happens with portdocs, etc.

I have tried this in tinderbox, and it seems to do what we both want it to, just in a slightly different order.

I have more more pass at tinderbox, and then I will commit this pr unless I find anything else.

Thanks again for your efforts.
-- 
Michael Scheidell, CTO
SECNAP Network Security Corporation
http://people.freebsd.org/~scheidell

______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r). 
For Information please see http://www.spammertrap.com/
______________________________________________________________________  
  
Comment 10 Michael Scheidell freebsd_committer freebsd_triage 2012-04-14 12:41:28 UTC
ps, you don't need this:

.if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
  .endif

PORTDOCS macro in /usr/ports/Mk/*options?) takes care of the mkdir.


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 11 Michael Scheidell freebsd_committer freebsd_triage 2012-04-14 14:05:58 UTC
Always test in tinderbox :-)

my new makefile,
MAKE_ENV=      HB_ARCHITECTURE=${HB_ARCH} \

needed to be
MAKE_ENV+=      HB_ARCHITECTURE=${HB_ARCH} \


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 12 dfilter service freebsd_committer freebsd_triage 2012-04-14 14:25:22 UTC
scheidell    2012-04-14 13:25:07 UTC

  FreeBSD ports repository

  Modified files:
    lang/harbour         Makefile distinfo pkg-plist 
  Log:
  - Update to 3.0.0 [1]
  - Unbreak port on FreeBSD 9 [1]
  - Minor re-arrangement of Makefile for clarity [2]
  
  PR:             ports/166754 [1]
  Submitted by:   Mikhail T <m.tsatsenko@gmail.com> (maintainer) [1]
  Reviewed by:    scheidell (me) [2]
  
  Revision  Changes    Path
  1.24      +98 -19    ports/lang/harbour/Makefile
  1.7       +2 -2      ports/lang/harbour/distinfo
  1.6       +295 -221  ports/lang/harbour/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 13 Michael Scheidell freebsd_committer freebsd_triage 2012-04-14 14:25:28 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!