ports/77521: [Maintainer Update] fix xmess build on RELENG_4, strike 2

[Miguel Mendez]

>Number:         77521
>Category:       ports
>Synopsis:       [Maintainer Update] fix xmess build on RELENG_4, strike 2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 14 18:20:23 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:


System: FreeBSD 5.3-STABLE #0: Tue Feb  8 13:02:32 CET 2005
    root at scienide.energyhq.es.eu.org:/usr/src/sys/i386/compile/SCIENIDE.SMP



>Description:


RELENG_4's ld cannot link code with duplicate symbols. I've
decided to not link messtest at all since we don't even install it.


>How-To-Repeat:





>Fix:


--- xmame.diff begins here ---
diff -ruN xmame.old/Makefile xmame/Makefile
--- xmame.old/Makefile	Sat Feb 12 18:40:31 2005
+++ xmame/Makefile	Mon Feb 14 18:10:02 2005
@@ -253,13 +253,6 @@
 .endfor
 	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h
 
-.if ${MAMEMESS} == "mess"
-.if ${OSVERSION} < 500000
-	${REINPLACE_CMD} -e "s at -Wl,--allow-multiple-definition@@" \
-		${WRKSRC}/makefile.mes ${WRKSRC}/src/unix/unix.mak
-.endif
-.endif
-
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
 		${GMAKE} doc/x${MAMEMESS}.6
diff -ruN xmame.old/files/patch-makefile.mes xmame/files/patch-makefile.mes
--- xmame.old/files/patch-makefile.mes	Thu Jan  1 01:00:00 1970
+++ xmame/files/patch-makefile.mes	Mon Feb 14 18:05:41 2005
@@ -0,0 +1,11 @@
+--- makefile.mes.orig	Mon Feb 14 18:03:35 2005
++++ makefile.mes	Mon Feb 14 18:05:09 2005
+@@ -344,7 +344,7 @@
+ 		$(OBJ)/mess/windows/parallel.o			\
+ 		$(OBJ)/mess/windows/strconv.o			
+ 	@echo Linking $@...
+-	$(LD) $(LDFLAGS) $(CONSOLE_PROGRAM) $^ -Wl,--allow-multiple-definition $(ZLIB) $(LIBS) -lwinmm -o $@
++	touch $@
+ 
+ # secondary libraries
+ $(OBJ)/libexpat.a: $(OBJ)/expat/xmlparse.o $(OBJ)/expat/xmlrole.o $(OBJ)/expat/xmltok.o
diff -ruN xmame.old/files/patch-src-unix-unix.mak xmame/files/patch-src-unix-unix.mak
--- xmame.old/files/patch-src-unix-unix.mak	Thu Jan  1 01:00:00 1970
+++ xmame/files/patch-src-unix-unix.mak	Mon Feb 14 18:09:39 2005
@@ -0,0 +1,11 @@
+--- src/unix/unix.mak.orig	Mon Feb 14 18:08:49 2005
++++ src/unix/unix.mak	Mon Feb 14 18:09:12 2005
+@@ -599,7 +599,7 @@
+ 	$(OBJDIR)/sysdep/rc.o \
+ 	$(OBJDIR)/tststubs.o
+ 	$(CC_COMMENT) @echo 'Linking $@...'
+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $(MY_LIBS) $^ -Wl,--allow-multiple-definition -o $@
++	touch $@
+ 
+ $(OBJDIR)/tststubs.o: src/unix/tststubs.c
+ 	$(CC_COMPILE) $(CC) $(MY_CFLAGS) -o $@ -c $<
--- xmame.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: