Created attachment 1885 [details]
cd to SRC_ROOT/freetype, and patch -p0 < /path/to/patchfile

Created attachment 1933 [details]
cd SRC_ROOT/freetype, patch -p0 < /path/to/patchfile  Diff against CVS as of 6/11/02 10PM CST

6/11 patch corrects bad .ENDIF position from 6/6 patch as well.

Hi,    
    
I looked at this and since the main change is MacOSX specific (the    
flat_namespace is in a Darwin/Rhapsody case statement in configure   
it is fine).   
   
However I belive the correct way to create a patch for these  
external modules is to:   
   
1. cd freetype   
2. build   
   
3. now make all of the required changes in the output tree in   
misc/... and then once those changes are made   
4. dmake create_patch   (right in freetype module directory)   
   
and that will create a new patch file which should be committed as a   
whole to the tree (something to do with line ends and things I   
believe) instead of patching the patch file directly.   
   
As for the change to the makefile.mk itself.  I am not sure if this 
will barf on a system that does not have a .dylib.  So I would much 
rather you changed this to 
 
.IF (whatever defines MACOSX GUI)  
OUT2LIB += objs$/.libs$/libfreetype.*.dylib 
.END.if  
 
.IF "$(GUI)"=="UNX" 
 OUT2LIB= \ 
 	objs$/.libs$/libfreetype.a \ 
	objs$/.libs$/libfreetype.so.6* 
.ENDIF			# "$(GUI)"=="UNX" 
 
.IF (whatever defines MACOSX GUI)  
OUT2LIB += objs$/.libs$/libfreetype.*.dylib 
.ENDIF  
 
Once you ahve those change made, I would be happy to approve the 
commits. 
 
Kevin 
 

Created attachment 2326 [details]
cd to SRC_ROOT/freetype, patch -p0 < /path/to/patchfile, rebuild.  This is clean diff against 072402 CVS

Created attachment 2327 [details]
new patchfile for freetype patch, made with dmake create_patch on 072402

Kevin,

Could you look at these new patches and then approve/disapprove again?

Thanks,
Dan

Hi Dan,  
  
I think your freetype makefile.mk is backwards:  
  
  .IF "$(GUI)"=="UNX" 
  OUT2LIB= \ 
        objs$/.libs$/libfreetype.a \ 
+ .IF "$OS"=="MACOSX" 
        objs$/.libs$/libfreetype.so.6* 
+ .ELSE 
+       objs$/.libs$/libfreetype.*.dylib 
+ .ENDIF                        # "$(OS)"=="MACOSX" 
 
  .ENDIF                        # "$(GUI)"=="UNX" 
   
 
I think you want to reverse the lines or change it to a not equal. 
 
Kevin 
  

Created attachment 2330 [details]
use same as previous 072402 patch, but this one SUPERCEDES previous 072402 patch

Hi, 
 
Approved. 
 
Kevin 
  

Created attachment 2361 [details]
cd SRC_ROOT/freetype, patch -p0 < /path/to/patchfile, then copy freetype-2.0.5.patch to SRC_ROOT/freetype

I made a mistake in the 072402.2 patch which would barf dmake.  I had not put () around the OS env variable.  072502 patch fixes this and should be committed along with freetype-2.0.5.patch INSTEAD of the freetype.OOO_STABLE_1.072402.2.patch file.

Dan

Created attachment 2362 [details]
cd to SRC_ROOT/freetype, patch -p0 < /path/to/patchfile, then copy freetype-2.0.5.patch to SRC_ROOT/freetype, these patches SUPERCEDE all others

Hi,

I hope this is the last time I have to get this right :)  This one actually works.

Approve and commit:
freetype.OOO_STABLE_1.072602.patch
freetype-2.0.5.patch

Dan

Hi Dan,

freetype.OOO_STABLE_1.072602.patch is approved

Isn't freetype-2.0.5.patch already in OOO_STABLE_1?

Heiner

The freetype-2.0.5.patch attached to this issue is the patch created 
with dmake create_patch, as requested for issues that require changes 
to a patchfile for an external component.

It is a drop-in replacement for the existing file in freetype/.  It 
is a new patch for freetype with all the MacOS X/Darwin changes to 
freetype, as opposed to a normal patch that just patches the 
patchfile (like the first two here).

Like I said, apply freetype.OOO_STABLE_1.072602.patch, then copy 
freetype-2.0.5 into SRC_ROOT/freetype

Dan

Hi Dan,

the freetype-2.0.5-patch is approved, too.

Heiner

Committed patch to OOO_STABLE_1_PORTS

merged to OOO_STABLE_1
merged to HEAD

resolved conflicts

removed keyword: merge_pending

close issue.