5 files changed, 83 insertions, 37 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 5be2f2bc498b..49cff30c8c50 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	transfig
-# Version required:	3.2.1
+# Version required:	3.2.3
 # Date created:		9 August 1996
 # Whom:			chuckr@freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	transfig.3.2.1
-PKGNAME=	transfig-3.2.1
+DISTNAME=	transfig.3.2.3
+PKGNAME=	transfig-3.2.3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_XCONTRIB} ${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
+		ftp://www-epb.lbl.gov/xfig/
 MASTER_SITE_SUBDIR=	applications/drawing_tools/transfig
-DISTFILES=	transfig.3.2.1.tar.gz transfig.3.2.ja_JP.EUC.ps.gz
 
 MAINTAINER=	chuckr@freebsd.org
 
@@ -20,12 +20,9 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 
 USE_IMAKE=	yes
-EXTRACT_ONLY=	transfig.3.2.1.tar.gz
 MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
 
-post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/fig2dev
-	@${GZCAT} ${DISTDIR}/transfig.3.2.ja_JP.EUC.ps.gz \
-		> ${PREFIX}/lib/X11/fig2dev/ja_JP.EUC.ps
+post-patch:
+	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/fig2dev/Imakefile
 
 .include <bsd.port.mk>
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
index 7ee8a25ccebd..5bfecf15b897 100644
--- a/print/transfig/distinfo
+++ b/print/transfig/distinfo
@@ -1,2 +1 @@
-MD5 (transfig.3.2.1.tar.gz) = 6bc1ecdd6b72da1bf3ad4ffcb7975fb9
-MD5 (transfig.3.2.ja_JP.EUC.ps.gz) = c608af518c15cf44d57a6abe3ce86b2f
+MD5 (transfig.3.2.3.tar.gz) = 1cd02e931b9cf7dfb955694369e72c8c
diff --git a/print/transfig/files/patch-ac b/print/transfig/files/patch-ac
index 8c68feed3314..8ebf848695c1 100644
--- a/print/transfig/files/patch-ac
+++ b/print/transfig/files/patch-ac
@@ -1,24 +1,49 @@
---- fig2dev/Imakefile.orig	Tue Jun 30 16:52:50 1998
-+++ fig2dev/Imakefile	Fri Dec 24 10:44:17 1999
-@@ -31,7 +31,7 @@
+--- fig2dev/Imakefile.orig	Fri Jan 14 12:59:04 2000
++++ fig2dev/Imakefile	Sat Jan 22 09:16:13 2000
+@@ -27,7 +27,7 @@
  XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
  XCOMM and installed xfig.  This will be made automatic in the future.
  
 -XFIGLIBDIR =	/usr/local/lib/X11/xfig
-+XFIGLIBDIR =	$(PREFIX)/lib/X11/xfig
++XFIGLIBDIR =	$(LIBDIR)/xfig
  
  XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
  XCOMM comment out NEED_STRERROR with an XCOMM comment.
-@@ -42,7 +42,7 @@
+@@ -38,7 +38,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
 -XCOMM USEINLINE = -DUSE_INLINE
 +USEINLINE = -DUSE_INLINE
  
- XCOMM Unomment the #define for USEXPM if you want to use the XPM
- XCOMM (color pixmap) package.
-@@ -112,11 +112,11 @@
+ XCOMM Change RGB if necessary, to point to your rgb.txt color database
+ XCOMM file (for X11).  This is needed for the -g (background color) option.
+@@ -54,11 +54,11 @@
+ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
+ XCOMM
+ 
+-XCOMM #define USEXPM
++#define USEXPM
+ 
+ #ifdef USEXPM
+ XPMLIBDIR = $(USRLIBDIR)
+-XPMINC = -I/usr/include/X11
++XPMINC = -I$(INCDIR)/X11
+ #endif
+ 
+ XCOMM For Linux machines or any machines that have a separate library for
+@@ -87,8 +87,8 @@
+ 
+ #ifdef USEJPEG
+ #ifdef USEINSTALLEDJPEG
+-JPEGLIBDIR = /usr/local/lib
+-JPEGINCDIR = /usr/include/X11
++JPEGLIBDIR = %%LOCALBASE%%/lib
++JPEGINCDIR = %%LOCALBASE%%/include
+ #else
+ JPEGLIBDIR = ../jpeg
+ JPEGINCDIR = $(JPEGLIBDIR)
+@@ -127,12 +127,12 @@
  
  XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
  
@@ -27,26 +52,19 @@
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
 -I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
-+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(PREFIX)/lib/X11/fig2dev\"'
- #endif
++FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
++I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"'
  
- DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(USEINLINE) \
-@@ -154,7 +154,7 @@
+ install::
+ 	[ -d $(FIG2DEV_LIBDIR) ] || mkdir $(FIG2DEV_LIBDIR)
+@@ -177,7 +177,7 @@
+ DUSEJPEG = -DUSE_JPEG
  
  #ifdef USEINSTALLEDJPEG
- JPEGLIBDIR = /usr/local/lib
--JPEGINCDIR = /usr/include/X11
-+JPEGINCDIR = /usr/local/include
+-JPEGLIBDIR = /usr/local/lib
++JPEGLIBDIR = %%LOCALBASE%%/lib
  JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
  #else
  XCOMM this is relative to this directory (transfig/fig2dev)
-@@ -182,7 +182,7 @@
- INCLUDES = -I..
- 
- LOCAL_LIBRARIES = $(LIBTRANSFIG) $(JPEGLIB)
--#if defined(NetBSDArchitecture)
-+#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
- SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm -lcompat
- #else
- SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm
diff --git a/print/transfig/files/patch-ag b/print/transfig/files/patch-ag
new file mode 100644
index 000000000000..4d79e743eac8
--- /dev/null
+++ b/print/transfig/files/patch-ag
@@ -0,0 +1,11 @@
+--- fig2dev/dev/Imakefile.orig	Thu Jan  6 03:30:09 2000
++++ fig2dev/dev/Imakefile	Sat Jan 22 10:15:39 2000
+@@ -22,7 +22,7 @@
+ XCOMM the party supplying this software to the X Consortium.
+ 
+ INCLUDES = -I.. -I../..
+-#ifdef JPEGINCDIR
++#ifdef USE_JPEG
+ JPEGINC = -I$(JPEGINCDIR)
+ #endif
+ 
diff --git a/print/transfig/pkg-plist b/print/transfig/pkg-plist
index 246b708af33e..3ad208adcf12 100644
--- a/print/transfig/pkg-plist
+++ b/print/transfig/pkg-plist
@@ -3,7 +3,28 @@ bin/fig2ps2tex
 bin/fig2ps2tex.sh
 bin/pic2tpic
 bin/transfig
-lib/X11/fig2dev/ja_JP.EUC.ps
+lib/X11/fig2dev/japanese.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.EUC.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.eucJP.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.eucJP.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.EUC.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja.ps
+lib/X11/fig2dev/korean.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.EUC.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.eucKR.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.eucKR.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.EUC.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko.ps
 lib/X11/xfig/bitmaps/bricks.bmp
 lib/X11/xfig/bitmaps/circles.bmp
 lib/X11/xfig/bitmaps/crosshatch.bmp