diff options
| author | pav <pav@FreeBSD.org> | 2007-01-30 18:25:34 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-01-30 18:25:34 +0800 |
| commit | 68e4663f01d748743e0029f83931c02fba58eb4e (patch) | |
| tree | d24dbe32e4bdb87d0f3ba1c46717e6e34576e724 /print | |
| parent | c6c1440c2b66077bedba90612a4827a8051ec9c1 (diff) | |
| download | freebsd-ports-gnome-68e4663f01d748743e0029f83931c02fba58eb4e.tar.gz freebsd-ports-gnome-68e4663f01d748743e0029f83931c02fba58eb4e.tar.zst freebsd-ports-gnome-68e4663f01d748743e0029f83931c02fba58eb4e.zip | |
- Remove support for a.out format and PORTOBJFORMAT variable from individual
ports
With hat: portmgr
Diffstat (limited to 'print')
| -rw-r--r-- | print/asprint/files/patch-aa | 4 | ||||
| -rw-r--r-- | print/virtualpaper/Makefile | 15 |
2 files changed, 2 insertions, 17 deletions
diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-aa index 756ef0f0d9bc..68521926a3af 100644 --- a/print/asprint/files/patch-aa +++ b/print/asprint/files/patch-aa @@ -1,6 +1,6 @@ --- makefile.orig Fri Mar 14 19:34:48 1997 +++ makefile Wed Jun 21 02:59:31 2000 -@@ -1,18 +1,19 @@ +@@ -1,18 +1,17 @@ .KEEP_STATE: -CFLAGS = -O2 @@ -10,9 +10,7 @@ +CFLAGS ?= -O2 +CC ?= gcc +XLIB = -L$(X11BASE)/lib -lXaw -lXmu -lXt -+.if $(PORTOBJFORMAT) == "elf" +XLIB+= -Wl,-rpath,$(X11BASE)/lib -+.endif OBJS = asprint.o -INCS = - diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile index 0c354f6957da..0e031593f711 100644 --- a/print/virtualpaper/Makefile +++ b/print/virtualpaper/Makefile @@ -46,25 +46,12 @@ USE_GMAKE= yes .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 |