pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fsom: Use upstream, own Makefile



Module Name:	pkgsrc-wip
Committed By:	Winston Weinert <winston%ml1.net@localhost>
Pushed By:	winston
Date:		Fri Mar 30 05:15:17 2018 -0500
Changeset:	b279162712da0cb32e23e7c6fd0ab1d6f3cad6df

Modified Files:
	fsom/Makefile
	fsom/PLIST
	fsom/distinfo
Added Files:
	fsom/files/Makefile

Log Message:
fsom: Use upstream, own Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b279162712da0cb32e23e7c6fd0ab1d6f3cad6df

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fsom/Makefile       | 11 ++++++-----
 fsom/PLIST          |  3 +++
 fsom/distinfo       |  8 ++++----
 fsom/files/Makefile | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 9 deletions(-)

diffs:
diff --git a/fsom/Makefile b/fsom/Makefile
index f2bb0e75c9..8decc7191f 100644
--- a/fsom/Makefile
+++ b/fsom/Makefile
@@ -4,10 +4,10 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-DISTNAME=	fsom-${PORTVERSION}
-CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_GITHUB:=outpaddling/}
-GITHUB_TAG=	${PORTVERSION}
+DISTNAME=	fsom-0.0.0.20151117
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ekg/}
+GITHUB_TAG=	56695e1611d824cda97f08e932d25d08419170cd
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ekg/fsom
@@ -19,6 +19,7 @@ USE_LANGUAGES=	c c++
 CXXFLAGS+=	-fomit-frame-pointer -ffast-math
 INSTALL_TARGET=	install-strip
 
-PORTVERSION=	23c8bb0b0a1de866ef05ed2be283f67bca4d2f47
+pre-configure:
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fsom/PLIST b/fsom/PLIST
index 1d6117f8b4..7702b14e3d 100644
--- a/fsom/PLIST
+++ b/fsom/PLIST
@@ -1,3 +1,6 @@
 @comment $NetBSD$
 bin/fsom
+include/fsom/convert.h
+include/fsom/fsom.h
+include/fsom/split.h
 lib/libfsom.a
diff --git a/fsom/distinfo b/fsom/distinfo
index eaf0407eb5..b980e8fa42 100644
--- a/fsom/distinfo
+++ b/fsom/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (fsom-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47.tar.gz) = 6337af984e000f3b09d63917f0cbbda0303e13bd
-RMD160 (fsom-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47.tar.gz) = f5eee439bb78ab00d24d20abf1094dce6b9ac2a6
-SHA512 (fsom-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47.tar.gz) = 175ea5d2e22ff1570fa67f8ccf89ebc93f38b6a1cebba2607bcc34cbc0b6e944e012c031fc62da156684d46db4ad5e3d7e1f7758c2c79e4f06d7d1dc573fee91
-Size (fsom-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47-23c8bb0b0a1de866ef05ed2be283f67bca4d2f47.tar.gz) = 9983 bytes
+SHA1 (fsom-0.0.0.20151117-56695e1611d824cda97f08e932d25d08419170cd.tar.gz) = 73394629304f4877466657ee1100cc3f0146cb26
+RMD160 (fsom-0.0.0.20151117-56695e1611d824cda97f08e932d25d08419170cd.tar.gz) = c2f8b58e0e05e62ea835d735c0c8adbdc49b574a
+SHA512 (fsom-0.0.0.20151117-56695e1611d824cda97f08e932d25d08419170cd.tar.gz) = 422941495320d17661f54c41da07db20095c1a82df55921a159672744bf61d48ff3cbdc15f7a8424a6081e5466f2423d43f9b4382708b2f4ab0287be73d41aae
+Size (fsom-0.0.0.20151117-56695e1611d824cda97f08e932d25d08419170cd.tar.gz) = 9771 bytes
diff --git a/fsom/files/Makefile b/fsom/files/Makefile
new file mode 100644
index 0000000000..3ca92e0e0f
--- /dev/null
+++ b/fsom/files/Makefile
@@ -0,0 +1,52 @@
+
+# Use ?= to allow overriding from the env or command-line, e.g.
+#
+#       make CXXFLAGS="-O3 -fPIC" install
+#
+# Package managers will override many of these variables automatically, so
+# this is aimed at making it easy to create packages (Debian packages,
+# FreeBSD ports, MacPorts, pkgsrc, etc.)
+
+CXX ?=		g++
+CXXFLAGS ?=	-w -O3 -pipe -fomit-frame-pointer -ffast-math
+AR ?=		ar
+MKDIR ?=	mkdir
+STRIP ?=	strip
+DESTDIR ?=	stage
+PREFIX ?=	/usr/local
+
+BIN =	fsom
+LIB =	libfsom.a
+OBJS =	fsom.o split.o
+MAIN =	main.o
+
+all:	${BIN} ${LIB}
+
+${BIN}:	${OBJS} ${MAIN}
+	${CXX} -o fsom ${OBJS} ${MAIN} -lm
+
+${LIB}:	${OBJS}
+	${AR} -rs ${LIB} ${OBJS}
+
+fsom.o:	fsom.c
+	${CXX} ${CXXFLAGS} -c fsom.c
+
+split.o: split.cpp
+	${CXX} ${CXXFLAGS} -c split.cpp
+
+main.o: main.cpp
+	${CXX} ${CXXFLAGS} -c main.cpp
+
+install: all
+	${MKDIR} -p ${DESTDIR}${PREFIX}/bin
+	${MKDIR} -p ${DESTDIR}${PREFIX}/include/fsom
+	${MKDIR} -p ${DESTDIR}${PREFIX}/lib
+	${INSTALL} ${BIN} ${DESTDIR}${PREFIX}/bin
+	${INSTALL} -m644 *.h ${DESTDIR}${PREFIX}/include/fsom
+	${INSTALL} -m644 ${LIB} ${DESTDIR}${PREFIX}/lib
+
+install-strip: install
+	${STRIP} ${DESTDIR}${PREFIX}/bin/${BIN}
+
+clean:
+	rm -rf *.o ${BIN} ${LIB} ${DESTDIR}


Home | Main Index | Thread Index | Old Index