Attachment #63039 for bug #94105

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

Lines 6-12 Link Here

(-)Makefile (-1 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= fig2sxd	8	PORTNAME= fig2sxd
9	PORTVERSION= 0.13	9	PORTVERSION= 0.14
10	CATEGORIES= graphics converters	10	CATEGORIES= graphics converters
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 23-28 Link Here
23	MAN1= fig2sxd.1	23	MAN1= fig2sxd.1
24	PLIST_FILES= bin/fig2sxd	24	PLIST_FILES= bin/fig2sxd
25		25
		26	post-patch:
		27	@${REINPLACE_CMD} -e '/^CXX/d' ${WRKSRC}/${MAKEFILE}
		28
26	do-install:	29	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	30	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
28	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1	31	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (fig2sxd_0.13.orig.tar.gz) = 3244a2708386fb3a78f31429b35565f0	1	MD5 (fig2sxd_0.14.orig.tar.gz) = 51686ccc400aa60b94173955f9e945ad
2	SHA256 (fig2sxd_0.13.orig.tar.gz) = f1efc4e307be38f237a7a7ca30cdcb8c2c32151c77cfa183ac5eef260d120c84	2	SHA256 (fig2sxd_0.14.orig.tar.gz) = 8139f51cda5ed5e965d058d5bc371586c944ae191b3f055f44cdb9d71b9128e6
3	SIZE (fig2sxd_0.13.orig.tar.gz) = 20689	3	SIZE (fig2sxd_0.14.orig.tar.gz) = 22261




--- Makefile.orig	Sun Jan 25 22:33:34 2004
+++ Makefile	Tue Sep  6 13:50:01 2005
@@ -43,28 +43,28 @@
 
 DEPEND = .depend-
 DEPFILES = $(SOURCES1:%.cpp=$(DEPEND)%.dep)
-CXX = g++
+CXX ?= g++
 CXXF = -Wall -O2 -g
-CXXFLAGS = -fno-rtti -fno-exceptions $(CXXF) $(INCLUDES)
+CXXFLAGS ?= -fno-rtti -fno-exceptions $(CXXF) $(INCLUDES)
 LIBS = -lz
 
 $(TARGET1): $(OBJECTS1)
-	$(CXX) -o $@ $^ $(LIBS)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 
 $(OBJECTS1): %.o: $(SRCDIR)%.cpp $(DEPEND)%.dep
 	$(CXX) $(CXXFLAGS) -o $@ -c $<
 
 $(DEPFILES): $(DEPEND)%.dep: $(SRCDIR)%.cpp
-	$(CXX) $(INCLUDES) -M $< > $@
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -M $< > $@
 
 -include $(DEPFILES)
 
 clean:
 	rm -f $(TARGETS) $(OBJECTS1) $(DEPFILES)
 
-all: install
+all: $(TARGET1) fig2sxd.1
 
-install: $(TARGET1) fig2sxd.1
+install:
 	install -d $(DESTDIR)/bin $(DESTDIR)/share/man/man1
 	install -m755 $(TARGET1) $(DESTDIR)/bin
 	install -m644 fig2sxd.1  $(DESTDIR)/share/man/man1

Return to bug 94105

Removed Link Here

(-)files/patch-Makefile (-37 lines)
1	--- Makefile.orig Sun Jan 25 22:33:34 2004
2	+++ Makefile Tue Sep 6 13:50:01 2005
3	@@ -43,28 +43,28 @@
4
5	DEPEND = .depend-
6	DEPFILES = $(SOURCES1:%.cpp=$(DEPEND)%.dep)
7	-CXX = g++
8	+CXX ?= g++
9	CXXF = -Wall -O2 -g
10	-CXXFLAGS = -fno-rtti -fno-exceptions $(CXXF) $(INCLUDES)
11	+CXXFLAGS ?= -fno-rtti -fno-exceptions $(CXXF) $(INCLUDES)
12	LIBS = -lz
13
14	$(TARGET1): $(OBJECTS1)
15	- $(CXX) -o $@ $^ $(LIBS)
16	+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
17
18	$(OBJECTS1): %.o: $(SRCDIR)%.cpp $(DEPEND)%.dep
19	$(CXX) $(CXXFLAGS) -o $@ -c $<
20
21	$(DEPFILES): $(DEPEND)%.dep: $(SRCDIR)%.cpp
22	- $(CXX) $(INCLUDES) -M $< > $@
23	+ $(CXX) $(CXXFLAGS) $(INCLUDES) -M $< > $@
24
25	-include $(DEPFILES)
26
27	clean:
28	rm -f $(TARGETS) $(OBJECTS1) $(DEPFILES)
29
30	-all: install
31	+all: $(TARGET1) fig2sxd.1
32
33	-install: $(TARGET1) fig2sxd.1
34	+install:
35	install -d $(DESTDIR)/bin $(DESTDIR)/share/man/man1
36	install -m755 $(TARGET1) $(DESTDIR)/bin
37	install -m644 fig2sxd.1 $(DESTDIR)/share/man/man1