Attachment #64622 for bug #96020

View | Details | Raw Unified | Return to bug 96020
Collapse All | Expand All





PORTNAME=	trustedqsl
PORTVERSION=	1.11
PORTREVISION=	2
CATEGORIES=	comms hamradio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	trustedqsl
DISTFILES=	tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz

MAINTAINER=	db@db.net
COMMENT=	Amateur Radio Station electronic trusted logbook


USE_PERL5=	yes
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

.endif

post-patch:
	@${CP} ${FILESDIR}/Makefile  ${WRKSRC}
	@${REINPLACE_CMD} -e 's|%%INSTALL%%|${INSTALL_PROGRAM}|' \
		-e 's|%%PREFIX%%|${PREFIX}|' \
		${WRKSRC}/Makefile
	@${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11  ${WRKSRC}/TrustedQSL-1.11/Makefile
	@${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11  ${WRKSRC}/TrustedQSL-1.11/sysconfig.h

do-extract:
	@${RM} -rf ${WRKDIR}

	done

post-install:
	${MKDIR} ${PREFIX}/etc/tqsl
	${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/config.xml ${PREFIX}/etc/tqsl/config.xml
.if !defined(NOPORTDOCS)
	@${MKDIR} ${PREFIX}/share/doc/tqslcert
	@${MKDIR} ${PREFIX}/share/doc/tqslapp
	@${INSTALL_DATA} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/
	@${INSTALL_DATA} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/
	@${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/LICENSE ${PREFIX}/share/doc/tqsllib
	@${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/ChangeLog ${PREFIX}/share/doc/tqsllib
.endif
	@${ECHO}
	@${ECHO} trustedqsl is now installed.
	@${ECHO} You will have to create a directory .tqsl in your
	@${ECHO} home directory and setup a copy of
	@${ECHO} ${PREFIX}/etc/tqsl/config.xml here
	@${ECHO} before this program will run correctly.
	@${ECHO}

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)/usr/home/db/trustedqsl/distinfo (-3 / +3 lines)
1	MD5 (tqsllib-1.4.tar.gz) = 008705afbf39f52e0984e195d32e8378	1	MD5 (tqsllib-2.0.tar.gz) = eab6bcd6c93561881f68ef184456a193
2	SHA256 (tqsllib-1.4.tar.gz) = 3b21fa2734c95c872847c9ce81590cf34b97d48274f307cdf784eed57f76643c	2	SHA256 (tqsllib-2.0.tar.gz) = 083c4405455c5b5a711e82275fe2b7106266bfc1edbd1a78ef542244e25909dc
3	SIZE (tqsllib-1.4.tar.gz) = 160585	3	SIZE (tqsllib-2.0.tar.gz) = 433450
4	MD5 (TrustedQSL-1.11.tar.gz) = 2b39274763ec27823489f2eca975fdab	4	MD5 (TrustedQSL-1.11.tar.gz) = 2b39274763ec27823489f2eca975fdab
5	SHA256 (TrustedQSL-1.11.tar.gz) = 1b208e6f84602c161d936dae161e40b555ebc53883b4eda33d6e8f5fa84d68d9	5	SHA256 (TrustedQSL-1.11.tar.gz) = 1b208e6f84602c161d936dae161e40b555ebc53883b4eda33d6e8f5fa84d68d9
6	SIZE (TrustedQSL-1.11.tar.gz) = 346049	6	SIZE (TrustedQSL-1.11.tar.gz) = 346049

Lines 1-9 Link Here

(-)/usr/home/db/trustedqsl/files/Makefile (-2 / +4 lines)
1	# $FreeBSD: ports/comms/trustedqsl/files/Makefile,v 1.2 2005/11/22 21:40:50 pav Exp $	1	# $FreeBSD: ports/comms/trustedqsl/files/Makefile,v 1.2 2005/11/22 21:40:50 pav Exp $
2		2
3	all:	3	all:
4	(cd tqsllib;make)	4	(cd tqsllib-2.0;./configure --with-wxwindows=${X11BASE}/bin/wxgtk2-2.6-config;make;make converter;make gen_crq;make load_cert;make station_loc)
5	(cd TrustedQSL-1.11;make)	5	(cd TrustedQSL-1.11;make)
6		6
7	install:	7	install:
8	(cd tqsllib;make install)	8	(cd tqsllib-2.0;make install)
		9	(cd tqsllib-2.0/.libs; \
		10	%%INSTALL%% converter gen_crq load_cert station_loc %%PREFIX%%/bin)
9	(cd TrustedQSL-1.11;make install)	11	(cd TrustedQSL-1.11;make install)

Lines 1-8 Link Here

(-)/usr/home/db/trustedqsl/files/Makefile.TrustedQSL-1.11 (-7 / +5 lines)
1	TQSLLIB=../tqsllib	1	TQSLLIB=../tqsllib-2.0/.libs
2	TQSLINC=../tqsllib	2	TQSLINC=../tqsllib-2.0
3	TQSL_VERSION_MAJOR = 1	3	TQSL_VERSION_MAJOR = 2
4	TQSL_VERSION_MINOR = 11	4	TQSL_VERSION_MINOR = 0
5	OPENSSL=/usr/local
6	LIBS=-lz -lexpat -lcrypto	5	LIBS=-lz -lexpat -lcrypto
7	INCDIR = -I$(TQSLINC)	6	INCDIR = -I$(TQSLINC)
8	BUILD = unofficial	7	BUILD = unofficial
Lines 11-17 Link Here
11	DEFS = -DHAVE_CONFIG_H	10	DEFS = -DHAVE_CONFIG_H
12	CXXFLAGS += $(DEFS) $(INCDIR) -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1 $(WXFLAGS)	11	CXXFLAGS += $(DEFS) $(INCDIR) -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1 $(WXFLAGS)
13		12
14	LDLIBS = -L$(TQSLLIB) -L$(OPENSSL)/lib -ltqsllib $(LIBS) $(WXLIBS)	13	LDLIBS = -L$(TQSLLIB) -ltqsllib $(LIBS) $(WXLIBS)
15	TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a	14	TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a
16	CCDEPMODE = depmode=gcc3	15	CCDEPMODE = depmode=gcc3
17	BINDIR=${PREFIX}/bin	16	BINDIR=${PREFIX}/bin
Lines 62-65 Link Here
62	install:	61	install:
63	${INSTALL} -d $(BINDIR) $(ETCDIR)/tqsl	62	${INSTALL} -d $(BINDIR) $(ETCDIR)/tqsl
64	${INSTALL} -C $(TARGETS) $(BINDIR)	63	${INSTALL} -C $(TARGETS) $(BINDIR)
65	${INSTALL} -C ../tqsllib/config.xml $(ETCDIR)/tqsl




CXX = g++
CC ?= gcc
LIBS=-lcrypto -lexpat 
CXXFLAGS += -I.  -I${LOCALBASE}/include -DHAVE_CONFIG_H
LDFLAGS = -L. $(LIBS) -L${LOCALBASE}/lib -lstdc++
TARGETS = gen_crq load_cert station_loc dumptqsldata converter
ZLIB=z
MYLIB=tqsllib

OBJS= tqsllib.o openssl_cert.o adif.o  xml.o\
	location.o tqslconvert.o cabrillo.o

all: $(TARGETS)

gen_crq: gen_crq.o lib$(MYLIB).a
	${CXX} -o gen_crq gen_crq.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)

load_cert: load_cert.o lib$(MYLIB).a
	${CXX} -o load_cert load_cert.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
	
converter: converter.o lib$(MYLIB).a
	${CXX} -o converter converter.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
	
station_loc: station_loc.o lib$(MYLIB).a
	${CXX} -o station_loc station_loc.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)

dumptqsldata: dumptqsldata.o lib$(MYLIB).a
	${CXX} -o dumptqsldata dumptqsldata.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
	
include tqsllib.depends

libtqsllib.a: $(OBJS)
	${AR} qc libtqsllib.a ${OBJS}

install:
	${INSTALL} gen_crq ${PREFIX}/bin
	${INSTALL} load_cert ${PREFIX}/bin
	${INSTALL} converter ${PREFIX}/bin
	${INSTALL} station_loc ${PREFIX}/bin
	${INSTALL} dumptqsldata ${PREFIX}/bin

clean:
	rm -f converter dumptqsldata gen_crq load_cert station_loc
	rm -f *.o *.lo *.a *.la *~ xxx.* *.a
	rm -rf .libs

%.o: %.cpp
	${CXX} ${CXXFLAGS} -c -o $@ $*.cpp





--- tqsllib-2.0/Makefile.in.orig	Fri Mar 11 07:58:31 2005
+++ tqsllib-2.0/Makefile.in	Tue Apr 18 15:53:02 2006
@@ -767,8 +767,7 @@
 
 info-am:
 
-install-data-am: install-dataDATA install-docDATA \
-	install-includeHEADERS
+install-data-am:	install-includeHEADERS
 
 install-exec-am: install-binPROGRAMS install-exec-local \
 	install-libLIBRARIES install-libLTLIBRARIES

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/patch-tqsllib-2.0_openssl_cert.cpp (+11 lines)
	1	--- tqsllib-2.0/openssl_cert.cpp.orig Fri Mar 11 07:47:11 2005
	2	+++ tqsllib-2.0/openssl_cert.cpp Wed Mar 29 11:27:41 2006
	3	@@ -1290,6 +1290,8 @@
	4	attrib->set = 1;
	5	#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00907000
	6	attrib->single = 0;
	7	+#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00908000
	8	+ attrib->single = 0;
	9	#else
	10	#error "Unexpected OpenSSL version; check X509_ATTRIBUTE struct compatibility"
	11	#endif




/* tqsllib/sysconfig.h.  Generated automatically by configure.  */
/* lotwdb/sysconfig.h.in.  Generated automatically from configure.in by autoheader.  */

/* Define to empty if the keyword does not work.  */
/* #undef const */

/* Define to `int' if <sys/types.h> doesn't define.  */
/* #undef mode_t */

/* Define if you have the ANSI C header files.  */
#define STDC_HEADERS 1

/* Define if your <sys/time.h> declares struct tm.  */
/* #undef TM_IN_SYS_TIME */

/* Defined if this is LOTW server code */
#undef LOTW_SERVER

/* Define if you have the mkdir function.  */
#define HAVE_MKDIR 1

/* Define if you have the strerror function.  */
#define HAVE_STRERROR 1

/* Define if you have the snprintf function.  */
#define HAVE_SNPRINTF 1

/* Define if you have the <unistd.h> header file.  */
#define HAVE_UNISTD_H 1

/* Define if you have the <getopt.h> header file.  */
#define HAVE_GETOPT_H 

/* Define if you have the crypto library (-lcrypto).  */
#define HAVE_LIBCRYPTO 1

/* Define if you have the dl library (-ldl).  */
#define HAVE_LIBDL 1

/* Define if you have the pcrl library (-lpcrl).  */
#undef HAVE_LIBPCRL

/* Define if you have the sqlca library (-lsqlca).  */
#undef HAVE_LIBSQLCA 


Return to bug 96020

Lines 7-17 Link Here

(-)/usr/home/db/trustedqsl/Makefile (-10 / +21 lines)
7		7
8	PORTNAME= trustedqsl	8	PORTNAME= trustedqsl
9	PORTVERSION= 1.11	9	PORTVERSION= 1.11
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= comms hamradio	11	CATEGORIES= comms hamradio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= trustedqsl	13	MASTER_SITE_SUBDIR= trustedqsl
14	DISTFILES= tqsllib-1.4.tar.gz TrustedQSL-1.11.tar.gz	14	DISTFILES= tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz
15		15
16	MAINTAINER= db@db.net	16	MAINTAINER= db@db.net
17	COMMENT= Amateur Radio Station electronic trusted logbook	17	COMMENT= Amateur Radio Station electronic trusted logbook
Lines 21-27 Link Here
21		21
22	USE_PERL5= yes	22	USE_PERL5= yes
23	USE_GETOPT_LONG= yes	23	USE_GETOPT_LONG= yes
24	USE_REINPLACE= yes
25	MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	24	MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
26		25
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Lines 33-43 Link Here
33	.endif	32	.endif
34		33
35	post-patch:	34	post-patch:
36	${CP} ${FILESDIR}/Makefile ${WRKSRC}	35	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
37	${CP} ${FILESDIR}/Makefile.tqsllib ${WRKSRC}/tqsllib/Makefile	36	@${REINPLACE_CMD} -e 's\|%%INSTALL%%\|${INSTALL_PROGRAM}\|' \
38	${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/Makefile	37	-e 's\|%%PREFIX%%\|${PREFIX}\|' \
39	${CP} ${FILESDIR}/sysconfig.h.tqsllib ${WRKSRC}/tqsllib/sysconfig.h	38	${WRKSRC}/Makefile
40	${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/sysconfig.h	39	@${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/Makefile
		40	@${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/sysconfig.h
41		41
42	do-extract:	42	do-extract:
43	@${RM} -rf ${WRKDIR}	43	@${RM} -rf ${WRKDIR}
Lines 51-61 Link Here
51	done	51	done
52		52
53	post-install:	53	post-install:
		54	${MKDIR} ${PREFIX}/etc/tqsl
		55	${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/config.xml ${PREFIX}/etc/tqsl/config.xml
54	.if !defined(NOPORTDOCS)	56	.if !defined(NOPORTDOCS)
55	@${MKDIR} ${PREFIX}/share/doc/tqslcert	57	@${MKDIR} ${PREFIX}/share/doc/tqslcert
56	@${MKDIR} ${PREFIX}/share/doc/tqslapp	58	@${MKDIR} ${PREFIX}/share/doc/tqslapp
57	@${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/	59	@${INSTALL_DATA} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/
58	@${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/	60	@${INSTALL_DATA} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/
		61	@${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/LICENSE ${PREFIX}/share/doc/tqsllib
		62	@${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/ChangeLog ${PREFIX}/share/doc/tqsllib
59	.endif	63	.endif
		64	@${ECHO}
		65	@${ECHO} trustedqsl is now installed.
		66	@${ECHO} You will have to create a directory .tqsl in your
		67	@${ECHO} home directory and setup a copy of
		68	@${ECHO} ${PREFIX}/etc/tqsl/config.xml here
		69	@${ECHO} before this program will run correctly.
		70	@${ECHO}
60		71
61	.include <bsd.port.post.mk>	72	.include <bsd.port.post.mk>

Lines 1-49 Link Here

(-)/usr/home/db/trustedqsl/files/Makefile.tqsllib (-49 lines)
1	CXX = g++
2	CC ?= gcc
3	LIBS=-lcrypto -lexpat
4	CXXFLAGS += -I. -I${LOCALBASE}/include -DHAVE_CONFIG_H
5	LDFLAGS = -L. $(LIBS) -L${LOCALBASE}/lib -lstdc++
6	TARGETS = gen_crq load_cert station_loc dumptqsldata converter
7	ZLIB=z
8	MYLIB=tqsllib
9
10	OBJS= tqsllib.o openssl_cert.o adif.o xml.o\
11	location.o tqslconvert.o cabrillo.o
12
13	all: $(TARGETS)
14
15	gen_crq: gen_crq.o lib$(MYLIB).a
16	${CXX} -o gen_crq gen_crq.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
17
18	load_cert: load_cert.o lib$(MYLIB).a
19	${CXX} -o load_cert load_cert.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
20
21	converter: converter.o lib$(MYLIB).a
22	${CXX} -o converter converter.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
23
24	station_loc: station_loc.o lib$(MYLIB).a
25	${CXX} -o station_loc station_loc.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
26
27	dumptqsldata: dumptqsldata.o lib$(MYLIB).a
28	${CXX} -o dumptqsldata dumptqsldata.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB)
29
30	include tqsllib.depends
31
32	libtqsllib.a: $(OBJS)
33	${AR} qc libtqsllib.a ${OBJS}
34
35	install:
36	${INSTALL} gen_crq ${PREFIX}/bin
37	${INSTALL} load_cert ${PREFIX}/bin
38	${INSTALL} converter ${PREFIX}/bin
39	${INSTALL} station_loc ${PREFIX}/bin
40	${INSTALL} dumptqsldata ${PREFIX}/bin
41
42	clean:
43	rm -f converter dumptqsldata gen_crq load_cert station_loc
44	rm -f .o .lo .a .la ~ xxx. *.a
45	rm -rf .libs
46
47	%.o: %.cpp
48	${CXX} ${CXXFLAGS} -c -o $@ $*.cpp
49

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/patch-tqsllib-2.0_Makefile.in (+12 lines)
	1	--- tqsllib-2.0/Makefile.in.orig Fri Mar 11 07:58:31 2005
	2	+++ tqsllib-2.0/Makefile.in Tue Apr 18 15:53:02 2006
	3	@@ -767,8 +767,7 @@
	4
	5	info-am:
	6
	7	-install-data-am: install-dataDATA install-docDATA \
	8	- install-includeHEADERS
	9	+install-data-am: install-includeHEADERS
	10
	11	install-exec-am: install-binPROGRAMS install-exec-local \
	12	install-libLIBRARIES install-libLTLIBRARIES

Lines 1-45 Link Here

(-)/usr/home/db/trustedqsl/files/sysconfig.h.tqsllib (-45 lines)
1	/* tqsllib/sysconfig.h. Generated automatically by configure. */
2	/* lotwdb/sysconfig.h.in. Generated automatically from configure.in by autoheader. */
3
4	/* Define to empty if the keyword does not work. */
5	/* #undef const */
6
7	/* Define to `int' if <sys/types.h> doesn't define. */
8	/* #undef mode_t */
9
10	/* Define if you have the ANSI C header files. */
11	#define STDC_HEADERS 1
12
13	/* Define if your <sys/time.h> declares struct tm. */
14	/* #undef TM_IN_SYS_TIME */
15
16	/* Defined if this is LOTW server code */
17	#undef LOTW_SERVER
18
19	/* Define if you have the mkdir function. */
20	#define HAVE_MKDIR 1
21
22	/* Define if you have the strerror function. */
23	#define HAVE_STRERROR 1
24
25	/* Define if you have the snprintf function. */
26	#define HAVE_SNPRINTF 1
27
28	/* Define if you have the <unistd.h> header file. */
29	#define HAVE_UNISTD_H 1
30
31	/* Define if you have the <getopt.h> header file. */
32	#define HAVE_GETOPT_H
33
34	/* Define if you have the crypto library (-lcrypto). */
35	#define HAVE_LIBCRYPTO 1
36
37	/* Define if you have the dl library (-ldl). */
38	#define HAVE_LIBDL 1
39
40	/* Define if you have the pcrl library (-lpcrl). */
41	#undef HAVE_LIBPCRL
42
43	/* Define if you have the sqlca library (-lsqlca). */
44	#undef HAVE_LIBSQLCA
45