5 files changed, 26 insertions, 70 deletions

diff --git a/devel/libxalloc/Makefile b/devel/libxalloc/Makefile
index 68806a3d3e58..89fc87cc45b7 100644
--- a/devel/libxalloc/Makefile
+++ b/devel/libxalloc/Makefile
@@ -7,21 +7,21 @@
 #
 
 PORTNAME=	libxalloc
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	devel
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	xalloc-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_GMAKE=	yes
+MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/libxalloc
-	@ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libxalloc
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libxalloc
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libxalloc/distinfo b/devel/libxalloc/distinfo
index 27ec1b1ed0ff..8797c833709f 100644
--- a/devel/libxalloc/distinfo
+++ b/devel/libxalloc/distinfo
@@ -1 +1 @@
-MD5 (xalloc-1.0.3.tar.gz) = 64ba37476b6b47c9fc2ea63c1e1f53d5
+MD5 (xalloc-1.0.4.tar.gz) = 2b0c5c32afcc4af0473fe7b4a4061888
diff --git a/devel/libxalloc/files/Makefile.lib b/devel/libxalloc/files/Makefile.lib
new file mode 100644
index 000000000000..9c88a7e8a043
--- /dev/null
+++ b/devel/libxalloc/files/Makefile.lib
@@ -0,0 +1,16 @@
+PREFIX?=	/usr/local
+SHLIB_VER?=	1
+
+LIB=	xalloc
+LIBDIR=	${PREFIX}/lib
+SHLIB_MAJOR=	${SHLIB_VER}
+SHLIB_MINOR=	0
+NOPROFILE=	yes
+NOOBJ=	yes
+
+INCS=	xalloc.h
+INCDIR=	${PREFIX}/include
+
+SRCS=	xalloc.c xmalloc.c xcalloc.c xrealloc.c xstrdup.c
+
+.include <bsd.lib.mk>
diff --git a/devel/libxalloc/files/patch-aa b/devel/libxalloc/files/patch-aa
deleted file mode 100644
index 5a87f84d9031..000000000000
--- a/devel/libxalloc/files/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.orig	Sun Jul  5 17:15:59 1998
-+++ Makefile	Sun Apr 29 23:29:53 2001
-@@ -8,7 +8,7 @@
- ###########################################################################
- 
- # Define SHARED as 1 for Linux shared ELF library
--#SHARED		= 1
-+SHARED		= 1
- 
- ifeq ($(SHARED),1)
- LIBTARGET	= lib$(DIST).so.$(VERSION)
-@@ -24,21 +24,21 @@
- 
- ###########################################################################
- 
--INSTBASEDIR	= /usr/local
-+INSTBASEDIR	= ${PREFIX}
- INSTLIBDIR	= $(INSTBASEDIR)/lib
- INSTINCDIR	= $(INSTBASEDIR)/include
--INSTALL		= install -m 644
-+INSTALL		= ${BSD_INSTALL_DATA}
- MKDIRP		= install -d -m 755
- 
- ###########################################################################
- 
--CC		= gcc
--OPTIM		= -O2
-+#CC		= gcc
-+OPTIM		= ${CFLAGS}
- 
- LIBDIR		= -L.
- INCDIR		= -I.
- 
--CCOPT		= -Wall $(OPTIM) $(INCDIR)
-+CCOPT		= $(INCDIR) $(CFLAGS)
- LDOPT		= $(LIBDIR)
- 
- # Object files to store in the library
-@@ -50,7 +50,7 @@
- 
- $(LIBTARGET): $(LIBOBJS)
- ifeq ($(SHARED),1)
--	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
-+	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS)
- else
- 	ar rcs $(LIBTARGET) $(LIBOBJS)
- endif
-@@ -63,12 +63,10 @@
- 
- install: $(LIBTARGET)
- 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
--	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
-+	$(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR)
- 	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
- ifeq ($(SHARED),1)
--	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
- 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
--	echo "If you use GNU/Linux, remember to run ldconfig"
- endif
- 
- clean:
diff --git a/devel/libxalloc/pkg-plist b/devel/libxalloc/pkg-plist
index ac2bfa08bd00..fa447fc762a1 100644
--- a/devel/libxalloc/pkg-plist
+++ b/devel/libxalloc/pkg-plist
@@ -1,7 +1,8 @@
 @comment $FreeBSD$
 include/xalloc.h
+lib/libxalloc.a
 lib/libxalloc.so
 lib/libxalloc.so.1
-share/doc/libxalloc/CREDITS
-share/doc/libxalloc/README
-@dirrm share/doc/libxalloc
+%%PORTDOCS%%share/doc/libxalloc/CREDITS
+%%PORTDOCS%%share/doc/libxalloc/README
+%%PORTDOCS%%@dirrm share/doc/libxalloc