diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-07 14:57:49 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-07 14:57:49 +0000 |
| commit | 5316d6995c9eab3e2b92e7994330d27312295f13 (patch) | |
| tree | e9433273f8212799f1369d579fb61a5ee351bcda /cad/electric | |
| parent | 9e9d988f842033e039bc66c3548d6f02510ffd5c (diff) | |
| download | ports-5316d6995c9eab3e2b92e7994330d27312295f13.tar.gz ports-5316d6995c9eab3e2b92e7994330d27312295f13.zip | |
- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: cad)
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=311861
Diffstat (limited to 'cad/electric')
| -rw-r--r-- | cad/electric/Makefile | 3 | ||||
| -rw-r--r-- | cad/electric/files/patch-Makefile.in | 17 |
2 files changed, 13 insertions, 7 deletions
diff --git a/cad/electric/Makefile b/cad/electric/Makefile index 107b36ed4af9..d0d62e44afec 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -55,8 +55,7 @@ post-patch: ${WRKSRC}/src/include/config.h @${REINPLACE_CMD} -e 's|/usr/share/electric/lib|${DATADIR}/lib|; \ s|/usr/share/electric/doc|${DOCSDIR}|; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|@PTHREAD_LIBS@|${PTHREAD_LIBS:S/"//g}|' \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/configure .for FEATURE in ${FEATURES} diff --git a/cad/electric/files/patch-Makefile.in b/cad/electric/files/patch-Makefile.in index 832ce013fc35..53fb875bbe81 100644 --- a/cad/electric/files/patch-Makefile.in +++ b/cad/electric/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 16 05:59:50 2004 -+++ Makefile.in Fri Jul 14 13:19:06 2006 +--- Makefile.in.orig 2004-07-16 03:59:50.000000000 +0200 ++++ Makefile.in 2013-02-07 14:08:44.000000000 +0100 @@ -1,14 +1,14 @@ ########################################################## USING QT ##### If using Qt, uncomment these five lines @@ -79,12 +79,19 @@ ##### If debugging, uncomment this line (modify debug options to taste) # DEBUG = -g3 -@@ -801,7 +802,7 @@ - $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@ +@@ -796,12 +797,12 @@ + BUILDOPTS = $(DEBUG) $(ARCHFLAGS) + BUILDDIR = obj + HDS = src/include +-CFLAGS = $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \ ++CFLAGS += $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \ + $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(SIMIRSIM_CFLAGS) \ +- $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@ ++ $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) XCFLAGS = $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS) LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \ - $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -+ $(LANGTCLLIBS) $(LANGJAVALIBS) $(INTERNATIONALLIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ ++ $(LANGTCLLIBS) $(LANGJAVALIBS) $(INTERNATIONALLIBS) -pthread FIND = find INSTALL = install DESTDIR = |