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 /mail | |
| 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 'mail')
| -rw-r--r-- | mail/cclient/Makefile | 6 | ||||
| -rw-r--r-- | mail/cclient/files/patch-ab | 6 | ||||
| -rw-r--r-- | mail/coolmail/files/patch-aa | 4 | ||||
| -rw-r--r-- | mail/faces/files/Makefile.compface | 5 |
4 files changed, 3 insertions, 18 deletions
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile index cb119596f396..e57f4caf10cd 100644 --- a/mail/cclient/Makefile +++ b/mail/cclient/Makefile @@ -20,7 +20,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= anders@FreeBSD.org COMMENT= Mark Crispin's C-client mail access routines -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ALL_TARGET= bsf .if defined(WITHOUT_SSL) MAKE_ARGS+= SSLTYPE=none @@ -43,10 +43,6 @@ PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "aout" -SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}.0 -.endif - post-patch: .for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file} diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab index d1c72f6fe8cc..de2e3b67231e 100644 --- a/mail/cclient/files/patch-ab +++ b/mail/cclient/files/patch-ab @@ -86,7 +86,7 @@ bsi: # BSD/i386 $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -@@ -801,23 +806,35 @@ +@@ -801,23 +806,31 @@ # Build it! @@ -102,11 +102,7 @@ @$(SH) ARCHIVE +$(SHLIBNAME): $(SOFILES) -+.if $(PORTOBJFORMAT) == "elf" + ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` -+.else -+ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` -+.endif + ln -s $(SHLIBNAME) lib$(SHLIBBASE).so + +.c.so: osdep.h diff --git a/mail/coolmail/files/patch-aa b/mail/coolmail/files/patch-aa index 7d6c667c6d6e..62e88e6d91db 100644 --- a/mail/coolmail/files/patch-aa +++ b/mail/coolmail/files/patch-aa @@ -1,6 +1,6 @@ --- Makefile.orig Thu Jan 11 11:55:40 1996 +++ Makefile Mon Oct 12 17:55:05 1998 -@@ -22,31 +22,40 @@ +@@ -22,31 +22,38 @@ # your linker where to find the libraries it will need, and BINDIR and # MANDIR specify the places to install the binary executable and manpage # files for coolmail when you type `make install'. @@ -32,9 +32,7 @@ LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext -COPTS = $(CFLAGS) $(AUDIO) -+.if $(PORTOBJFORMAT) == "elf" +LIBS += -Wl,-rpath,$(X11BASE)/lib -+.endif +COPTS = $(CFLAGS) $(AUDIO) $(MAILDIR) all: coolmail diff --git a/mail/faces/files/Makefile.compface b/mail/faces/files/Makefile.compface index 684a4cf7fc1e..8fd2c1c71b62 100644 --- a/mail/faces/files/Makefile.compface +++ b/mail/faces/files/Makefile.compface @@ -33,13 +33,8 @@ EXECUTABLE = $(BINDIR)/$(NAME) UNEXECUTABLE = $(BINDIR)/$(UNNAME) LIBNAME = lib$(NAME).a SHLIB_MAJOR = 1 -SHLIB_MINOR = 0 LIB = $(NAME) -.if ${PORTOBJFORMAT} == "elf" SOLIB = lib$(NAME).so.$(SHLIB_MAJOR) -.else -SOLIB = lib$(NAME).so.$(SHLIB_MAJOR).$(SHLIB_MINOR) -.endif NOPROFILE = '' LIBRARY = $(LIBDIR) MAN1DIR = $(MANDIR)/man1 |