- Fix broken behavior that overwrites some files from x11/xterm.

- Set mutual exclusive conflict between korean/hanterm{,-xf86}.

Approved by:	portmgr (marcus), cjh (maintainer, blanket)

4 files changed, 27 insertions, 14 deletions

diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index 12ae894b323d..e36509121aed 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	hanterm
 PORTVERSION=	2.0.5.173
+PORTREVISION=	1
 CATEGORIES=	korean x11
-MASTER_SITES=	http://download.kldp.net/hanterm-xf/
+MASTER_SITES=	http://kldp.net/frs/download.php/282/
 PKGNAMESUFFIX=	-xf
 DISTNAME=	hanterm${PKGNAMESUFFIX}-2.0.5-173
 
@@ -17,10 +18,7 @@ COMMENT=	X11R6-based xterm hacked for managing Korean languages
 
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
-BROKEN=		Removes files installed by another port
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
+CONFLICTS=	ko-hanterm-3.*
 USE_ICONV=	yes
 USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
@@ -29,7 +27,7 @@ CONFIGURE_ARGS+=	--enable-boxchar --enable-ansi-color \
 CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
 			CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAN1=		hanterm.1 resize.1
+MAN1=		hanterm.1
 
 pre-install:
 	${MKDIR} ${PREFIX}/share/hangul_keyboard
diff --git a/korean/hanterm-xf86/files/patch-makefile_in b/korean/hanterm-xf86/files/patch-makefile_in
index 5d815e6537bc..67b132f3d5f5 100644
--- a/korean/hanterm-xf86/files/patch-makefile_in
+++ b/korean/hanterm-xf86/files/patch-makefile_in
@@ -1,11 +1,28 @@
---- Makefile.in.orig	Tue Feb 18 18:56:34 2003
-+++ Makefile.in	Tue Feb 18 18:56:45 2003
-@@ -180,7 +180,7 @@
+--- Makefile.in.orig	Tue Feb 11 11:59:24 2003
++++ Makefile.in	Thu Aug  4 11:13:56 2005
+@@ -178,15 +178,12 @@
+ install-bin \
+ install-full :: $(BINNAME)$x resize$x $(BINDIR)
  	$(SHELL) $(srcdir)/sinstall.sh "$(INSTALL_PROGRAM)" $(BINNAME)$x  @XTERM_PATH@ $(BINDIR)/$(binary_xterm)
- 	$(INSTALL_PROGRAM) -s -m  755 resize$x $(BINDIR)/$(binary_resize)
+-	$(INSTALL_PROGRAM) -s -m  755 resize$x $(BINDIR)/$(binary_resize)
  	$(INSTALL_DATA) -m 444 $(srcdir)/keyboard/*.kbd $(srcdir)/keyboard/*.map $(KEYBDIR)
 -	$(INSTALL_PROGRAM) -m  755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm)
-+	$(INSTALL_SCRIPT) -m  755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm)
  
  install \
  install-man \
+ install-full :: $(MANDIR)
+ 	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/$(BINNAME).man    $(MANDIR)/$(actual_xterm).$(manext)
+-	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man   $(MANDIR)/$(actual_resize).$(manext)
+ 
+ install \
+ install-app \
+@@ -197,9 +194,6 @@
+ 	@echo installing $(APPSDIR)/$(CLASS)-color
+ 	@sed -e s/$(RESFNAME)/$(CLASS)/ $(srcdir)/$(RESFNAME)-col.ad >XTerm.tmp
+ 	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color
+-	@echo installing $(APPSDIR)/UXTerm
+-	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/UXTerm.ad >XTerm.tmp
+-	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm
+ 	@rm -f XTerm.tmp
+ 
+ install ::
diff --git a/korean/hanterm-xf86/pkg-plist b/korean/hanterm-xf86/pkg-plist
index ddc0b2bd8e6f..c9ff1c7ef830 100644
--- a/korean/hanterm-xf86/pkg-plist
+++ b/korean/hanterm-xf86/pkg-plist
@@ -1,9 +1,6 @@
 bin/hanterm
-bin/resize
-bin/uxterm
 lib/X11/app-defaults/Hanterm
 lib/X11/app-defaults/Hanterm-color
-lib/X11/app-defaults/UXTerm
 share/hangul_keyboard/2bul.kbd
 share/hangul_keyboard/3bul_390.kbd
 share/hangul_keyboard/3bul_final.kbd
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index 3088d79b8cf5..36e20837d53d 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -16,6 +16,7 @@ COMMENT=	An xterm hacked for managing Korean languages
 
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
 
+CONFLICTS=	ko-hanterm-xf-2.*
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES= yes
 ALL_TARGET=	hanterm