Re: path / binary name collisions in ports & base

[Jolan Luff <jolan_(_at_)_cryptonomicon_(_dot_)_org>]

On Fri, Feb 28, 2003 at 04:37:22PM -0600, Jolan Luff wrote:
> wcobb@ pointed out to me that devel/sdl-ttf installs a "showfont"
> binary which also exists in ${X11BASE}/bin.  he suggested resolving
> it by renaming it to sdl-showfont (which makes sense to me).

Patch attached that makes the change from showfont -> sdl-showfont.

- jolan

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl-ttf/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2003/02/23 18:30:20	1.14
+++ Makefile	2003/02/28 23:03:32
@@ -2,14 +2,12 @@
 
 COMMENT=	"SDL TrueType fonts library"
 
-VER=		2.0.5
-PROJ=		SDL_ttf
-DISTNAME=	${PROJ}-${VER}
-PKGNAME=	sdl-ttf-${VER}
+DISTNAME=	SDL_ttf-2.0.5
+PKGNAME=	sdl-ttf-2.0.5p0
 CATEGORIES=	devel graphics
-MASTER_SITES=	http://www.libsdl.org/projects/${PROJ}/release/
+MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
 
-HOMEPAGE=	http://www.libsdl.org/
+HOMEPAGE=	http://www.libsdl.org/projects/SDL_ttf/
 
 MAINTAINER=	Jolan Luff <jolan_(_at_)_cryptonomicon_(_dot_)_org>
 
Index: patches/patch-Makefile_am
===================================================================
RCS file: /cvs/ports/devel/sdl-ttf/patches/patch-Makefile_am,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_am
--- patches/patch-Makefile_am	2001/07/20 20:32:43	1.2
+++ patches/patch-Makefile_am	2003/02/28 23:03:32
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_am,v 1.2 2001/07/20 20:32:43 pvalchev Exp $
---- Makefile.am.orig	Mon Jul  9 17:08:26 2001
-+++ Makefile.am	Mon Jul  9 17:08:31 2001
-@@ -17,7 +17,6 @@ EXTRA_DIST =			\
+--- Makefile.am.orig	Sun Dec 16 22:27:39 2001
++++ Makefile.am	Fri Feb 28 16:58:14 2003
+@@ -19,7 +19,6 @@ EXTRA_DIST =			\
  	autogen.sh
  
  libSDL_ttf_la_LDFLAGS = 		\
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl-ttf/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in	2001/07/20 20:32:43	1.2
+++ patches/patch-Makefile_in	2003/02/28 23:03:32
@@ -1,8 +1,8 @@
 $OpenBSD: patch-Makefile_in,v 1.2 2001/07/20 20:32:43 pvalchev Exp $
---- Makefile.in.orig	Mon Jul  9 17:08:23 2001
-+++ Makefile.in	Mon Jul  9 17:08:42 2001
-@@ -98,7 +98,7 @@ libSDL_ttf_la_SOURCES =  	SDL_ttf.c
- EXTRA_DIST =  	CHANGES				VisualC.zip			SDL_ttf.spec			SDL_ttf.spec.in			autogen.sh
+--- Makefile.in.orig	Sat Apr 13 10:06:30 2002
++++ Makefile.in	Fri Feb 28 17:00:07 2003
+@@ -99,13 +99,13 @@ libSDL_ttf_la_SOURCES =  	SDL_ttf.c
+ EXTRA_DIST =  	CHANGES				VisualC.zip			PBProjects.tar.gz		MPWmake.sea.bin			SDL_ttf.spec			SDL_ttf.spec.in			autogen.sh
  
  
 -libSDL_ttf_la_LDFLAGS =  	-release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -10,3 +10,39 @@
  
  libSDL_ttf_la_LIBADD = 
  
+-bin_PROGRAMS = showfont glfont
++bin_PROGRAMS = sdl-showfont glfont
+ 
+-showfont_LDADD = libSDL_ttf.la
++sdl-showfont_LDADD = libSDL_ttf.la
+ glfont_LDADD = libSDL_ttf.la @GL_LIBS@ @MATHLIB@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -125,10 +125,10 @@ libSDL_ttf_la_DEPENDENCIES = 
+ libSDL_ttf_la_OBJECTS =  SDL_ttf.lo
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
+-showfont_SOURCES = showfont.c
+-showfont_OBJECTS =  showfont.o
+-showfont_DEPENDENCIES =  libSDL_ttf.la
+-showfont_LDFLAGS = 
++sdl-showfont_SOURCES = showfont.c
++sdl-showfont_OBJECTS =  showfont.o
++sdl-showfont_DEPENDENCIES =  libSDL_ttf.la
++sdl-showfont_LDFLAGS = 
+ glfont_SOURCES = glfont.c
+ glfont_OBJECTS =  glfont.o
+ glfont_DEPENDENCIES =  libSDL_ttf.la
+@@ -263,9 +263,9 @@ uninstall-binPROGRAMS:
+ 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	done
+ 
+-showfont: $(showfont_OBJECTS) $(showfont_DEPENDENCIES)
+-	@rm -f showfont
+-	$(LINK) $(showfont_LDFLAGS) $(showfont_OBJECTS) $(showfont_LDADD) $(LIBS)
++sdl-showfont: $(sdl-showfont_OBJECTS) $(sdl-showfont_DEPENDENCIES)
++	@rm -f sdl-showfont
++	$(LINK) $(sdl-showfont_LDFLAGS) $(sdl-showfont_OBJECTS) $(sdl-showfont_LDADD) $(LIBS)
+ 
+ glfont: $(glfont_OBJECTS) $(glfont_DEPENDENCIES)
+ 	@rm -f glfont
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/devel/sdl-ttf/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -r1.4 PFRAG.shared
--- pkg/PFRAG.shared	2002/05/04 11:27:28	1.4
+++ pkg/PFRAG.shared	2003/02/28 23:03:32
@@ -1,3 +1,3 @@
-_(_at_)_comment $OpenBSD: PFRAG.shared,v 1.4 2002/05/04 11:27:28 mark Exp $
+_(_at_)_comment $OpenBSD$
 lib/libSDL_ttf.so.0.5
-DYNLIBDIR(%B)
+DYNLIBDIR(%D/lib)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl-ttf/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST	2002/01/06 08:08:02	1.3
+++ pkg/PLIST	2003/02/28 23:03:32
@@ -1,6 +1,6 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.3 2002/01/06 08:08:02 mark Exp $
+_(_at_)_comment $OpenBSD$
 bin/glfont
-bin/showfont
+bin/sdl-showfont
 include/SDL/SDL_ttf.h
 lib/libSDL_ttf.a
 lib/libSDL_ttf.la