7 files changed, 11 insertions, 54 deletions
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index c349ff29bed3..62585ac54bf5 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Lossless compression for bi-level images such as scanned pages, faxes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=	jbgtopbm.1 pbmtojbg.1
 
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa
index 0377d047e905..bea5e3195a1d 100644
--- a/graphics/jbigkit/files/patch-aa
+++ b/graphics/jbigkit/files/patch-aa
@@ -36,7 +36,7 @@
  
  clean:
  	rm -f *~ core
-@@ -36,3 +36,27 @@
+@@ -36,3 +36,22 @@
  	  gzip -9f jbigkit-$(VERSION).tar )
  	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
  	cp CHANGES $(HOME)/public_html/jbigkit/
@@ -57,10 +57,5 @@
 +	${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include
 +	mkdir -p ${PREFIX}/lib
 +	${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib
-+.if ${PORTOBJFORMAT} == elf
 +	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 ${PREFIX}/lib
 +	ln -sf libjbig.so.1 ${PREFIX}/lib/libjbig.so
-+.else
-+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1.1 ${PREFIX}/lib
-+	ln -sf libjbig.so.1.1 ${PREFIX}/lib/libjbig.so
-+.endif
diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab
index 4f5889f3085f..85547868035a 100644
--- a/graphics/jbigkit/files/patch-ab
+++ b/graphics/jbigkit/files/patch-ab
@@ -1,6 +1,6 @@
 --- libjbig/Makefile.orig	Fri Apr 10 20:33:27 1998
 +++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
-@@ -5,9 +5,16 @@
+@@ -5,9 +5,12 @@
  CC = gcc
  
  # Options for the compiler: A high optimization level is suggested
@@ -9,28 +9,20 @@
  
 -all: libjbig.a tstcodec
 +JBIGLIB=libjbig.a
-+.if ${PORTOBJFORMAT} == elf
 +SOJBIGLIB=libjbig.so.1
-+.else
-+SOJBIGLIB=libjbig.so.1.1
-+.endif
 +
 +all: libjbig.a $(SOJBIGLIB)
  
  tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
  	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -18,10 +25,25 @@
+@@ -18,10 +25,21 @@
  	ar rc libjbig.a jbig.o jbig_tab.o
  	ranlib libjbig.a
  
 +$(SOJBIGLIB): jbig.so jbig_tab.so
 +	rm -f ${.TARGET}
-+.if ${PORTOBJFORMAT} == elf
 +	$(CC) -o ${.TARGET} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}         
 +	ln -sf ${.TARGET} `echo ${.TARGET} | sed 's/\.so.*$$/.so/'`
-+.else
-+	ld -Bshareable -o ${.TARGET} ${.ALLSRC}
-+.endif
 +	
  jbig.o: jbig.c jbig.h
  
diff --git a/graphics/juno-2/Makefile b/graphics/juno-2/Makefile
index 2a625fce5117..86c18d5a1001 100644
--- a/graphics/juno-2/Makefile
+++ b/graphics/juno-2/Makefile
@@ -36,25 +36,12 @@ EXAMPLESDIR=	${PREFIX}/share/examples/Juno
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 6d09ef4c1ffe..b46d041bfd08 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	A C/FORTRAN library for drawing graphs on a variety of display devices
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
 USE_XLIB=	yes
 USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
@@ -23,14 +24,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	5
-.else
-VERSION=	5.2
-.endif
-
 WANT_FORTRAN=	yes #dummy but future use
-BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
 FC=		gfortran42
 F77=		gfortran42
 MAKE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
@@ -38,7 +33,7 @@ MAKE_ARGS+=	X11BASE="${X11BASE}"
 
 post-install:
 .for f in libcpgplot.so libpgplot.so
-	${LN} -sf $f.${VERSION} ${PREFIX}/lib/$f
+	${LN} -sf $f.5 ${PREFIX}/lib/$f
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config::urt
index e38fc0f8d0a5..262d91126a6b 100644
--- a/graphics/urt/files/patch-config::urt
+++ b/graphics/urt/files/patch-config::urt
@@ -138,7 +138,7 @@
  #endif
  
  #ifdef SUNRASTER|SUNTOOLS|TAAC1
-@@ -216,9 +219,12 @@
+@@ -216,9 +219,10 @@
  
  #ifdef TIFF
  # Location of tiff library and include files.  Relative to URT root directory.
@@ -148,9 +148,7 @@
 +##defpath TIFFDIR
 +INCTIFF = -I${LOCALBASE}/include
 +LIBTIFF = -L${LOCALBASE}/lib -ltiff
-+.if ${PORTOBJFORMAT} == "elf"
 +LIBTIFF +=-Wl,-rpath,${LOCALBASE}/lib
-+.endif
  #endif
  
  #ifdef X10
diff --git a/graphics/urt/files/patch-lib::makefile.src b/graphics/urt/files/patch-lib::makefile.src
index dfb6034e5d5e..8d5f8a6cb2b5 100644
--- a/graphics/urt/files/patch-lib::makefile.src
+++ b/graphics/urt/files/patch-lib::makefile.src
@@ -1,6 +1,6 @@
 --- lib/makefile.src.orig	Thu Mar  5 04:32:53 1992
 +++ lib/makefile.src	Sat Dec 28 00:41:59 2002
-@@ -26,7 +26,14 @@
+@@ -26,7 +26,10 @@
  	vaxshort.o \
  	$(OPT_OBJS)
  
@@ -8,15 +8,11 @@
 +SOOBJS = $(OBJS:.o=.so)
 +
 +LIBANAME = librle.a
-+.if $(PORTOBJFORMAT) == "elf"
 +LIBSONAME = librle.so.1
-+.else
-+LIBSONAME = librle.so.1.0
-+.endif
  
  # Just rebuild the object files.
  objs: $(OBJS)
-@@ -37,40 +44,46 @@
+@@ -37,40 +44,40 @@
  # Do nothing if $(DEST) is empty (or not defined)
  install: buildlib
  	@sh -c "if test '$(DEST)x' != x ; then \
@@ -74,15 +70,9 @@
 +	$(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so
 +	$(LD) -X -r $*.so
 +
-+.if $(PORTOBJFORMAT) == "elf"
 +$(LIBSONAME): $(SOOBJS)
 +	-rm -f $@
 +	ld -shared -soname $@ -o $@ $(SOOBJS)
-+.else
-+$(LIBSONAME): $(SOOBJS)
-+	-rm -f $@
-+	ld -Bshareable -o $@ $(SOOBJS)
-+.endif
  
  # Clean up installed stuff and binaries
  pristine: clean