More cleanups from ajacoutot@

This commit is contained in:
mcbride 2008-03-15 15:52:53 +00:00
parent b09b618411
commit 3cea14cecc
3 changed files with 34 additions and 13 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2008/03/15 13:24:10 mcbride Exp $
# $OpenBSD: Makefile,v 1.3 2008/03/15 15:52:53 mcbride Exp $
COMMENT= stand-alone client/server 9P library
DISTNAME= libixp-0.4
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
HOMEPAGE= http://www.suckless.org
@ -15,10 +16,12 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/download/
WANTLIB= c m
WANTLIB= c
NO_REGRESS= Yes
FAKE_FLAGS= DESTDIR=""
pre-configure:
@perl -pi -e 's,!!CFLAGS!!,${CFLAGS},g;' \
-e 's,!!CC!!,${CC},g' ${WRKSRC}/config.mk
.include <bsd.port.mk>

View File

@ -1,12 +1,32 @@
$OpenBSD: patch-config_mk,v 1.1.1.1 2008/03/15 12:38:53 mcbride Exp $
--- config.mk.orig Tue Feb 19 02:08:27 2008
+++ config.mk Tue Feb 19 02:08:35 2008
@@ -11,7 +11,7 @@ RUBYINC = -I/usr/local/lib/ruby/1.8/i386-freebsd6
$OpenBSD: patch-config_mk,v 1.2 2008/03/15 15:52:53 mcbride Exp $
--- config.mk.orig Mon Nov 5 15:36:22 2007
+++ config.mk Sat Mar 15 15:07:30 2008
@@ -11,9 +11,9 @@ RUBYINC = -I/usr/local/lib/ruby/1.8/i386-freebsd6
TASKINC = -I${HOME}/libtask
# paths
-PREFIX = /usr/local
+#PREFIX = /usr/local
BIN = ${PREFIX}/bin
MAN = ${PREFIX}/share/man
-MAN = ${PREFIX}/share/man
+MAN = ${PREFIX}/man
ETC = ${PREFIX}/etc
LIBDIR = ${PREFIX}/lib
INCLUDE = ${PREFIX}/include
@@ -24,13 +24,13 @@ LIBS = -L/usr/lib -lc
# Flags
include ${ROOT}/mk/gcc.mk
-CFLAGS = -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
+CFLAGS = !!CFLAGS!! -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
LDFLAGS = -g ${LIBS}
# Compiler
-CC = cc -c
+CC = !!CC!! -c
# Linker (Under normal circumstances, this should *not* be 'ld')
-LD = cc
+LD = !!CC!!
# Other
AR = ar crs
#AR = sh -c 'ar cr "$$@" && ranlib "$$@"'

View File

@ -1,10 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/03/15 12:38:53 mcbride Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/03/15 15:52:53 mcbride Exp $
bin/ixpc
etc/
@comment etc/
include/ixp.h
include/ixp_fcall.h
lib/libixp.a
lib/libixp_pthread.a
share/man/
share/man/man1/
@man share/man/man1/ixpc.1
@man man/man1/ixpc.1